zcy
/
solvespace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add LDFLAGS for FLTK to exposed/Makefile.am and src/Makefile.am

pull/3/head
Andrew Downing 2015-02-25 22:47:35 -05:00
parent ce77197dac
commit 023f404475
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
exposed/Makefile.am
View File

@ -21,14 +21,17 @@ libslvs_a_SOURCES = \
../src/constrainteq.cpp \ ../src/constrainteq.cpp \
../src/system.cpp ../src/system.cpp
CDemo_LDADD =
if HAVE_FLTK if HAVE_FLTK
CDemo_SOURCES += ../src/fltk/fltkutil.cpp CDemo_SOURCES += ../src/fltk/fltkutil.cpp
CDemo_LDADD += $(FLTK_LDFLAGS) -lX11 -lGL -lGLU $(LIBSPNAV_LIBS)
endif endif
if WIN32 if WIN32
CDemo_SOURCES += ../src/win32/w32util.cpp CDemo_SOURCES += ../src/win32/w32util.cpp
endif endif
CDemo_LDADD = -lslvs $(FLTK_LDSTATICFLAGS) CDemo_LDADD += -lslvs
EXTRA_DIST = \ EXTRA_DIST = \
DOC.txt \ DOC.txt \

2
src/Makefile.am
View File

@ -80,7 +80,7 @@ solvespace_SOURCES += \
fltk/fltkmain.cpp \ fltk/fltkmain.cpp \
fltk/fltkutil.cpp fltk/fltkutil.cpp
solvespace_LDADD = $(FLTK_LDSTATICFLAGS) -lGLU $(LIBSPNAV_LIBS) solvespace_LDADD = $(FLTK_LDFLAGS) -lX11 -lGL -lGLU $(LIBSPNAV_LIBS)
endif endif
if WIN32 if WIN32