Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-07 17:35:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

In the configuration setp, LIBNAME (which contains the local path of the library as seen from the src directory) was used wrong. I added LIBBASENAME, the true library name without the path, and replaced LIBNAME wherever it was used wrongly.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6611 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Matthias Melcher
2008-12-29 19:45:46 +00:00
parent 7180c24f3c
commit 6b3f61e3ff
5 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/Makefile
+6 -6
View File
@@ -259,7 +259,7 @@ uninstall-osx:
../fluid/fluid$(EXEEXT) -c $<
# All demos depend on the FLTK library...
$(ALL): ../lib/$(LIBNAME)
$(ALL): $(LIBNAME)
# General demos...
unittests$(EXEEXT): unittests.o
@@ -315,7 +315,7 @@ editor$(EXEEXT): editor.o
fast_slow$(EXEEXT): fast_slow.o
fast_slow.cxx: fast_slow.fl ../fluid/fluid$(EXEEXT)
file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME)
file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
@@ -327,7 +327,7 @@ forms$(EXEEXT): forms.o
hello$(EXEEXT): hello.o
help$(EXEEXT): help.o ../lib/$(IMGLIBNAME)
help$(EXEEXT): help.o $(IMGLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
@@ -370,7 +370,7 @@ minimum$(EXEEXT): minimum.o
navigation$(EXEEXT): navigation.o
output$(EXEEXT): output.o ../lib/$(FLLIBNAME)
output$(EXEEXT): output.o $(FLLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS)
@@ -380,7 +380,7 @@ pack$(EXEEXT): pack.o
pixmap$(EXEEXT): pixmap.o
pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME)
pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME)
echo Linking $@...
$(CXX) $(ARCHFLAGS) $(LDFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS)
@@ -427,7 +427,7 @@ valuators$(EXEEXT): valuators.o
valuators.cxx: valuators.fl ../fluid/fluid$(EXEEXT)
# All OpenGL demos depend on the FLTK and FLTK_GL libraries...
$(GLALL): ../lib/$(LIBNAME) ../lib/$(GLLIBNAME)
$(GLALL): $(LIBNAME) $(GLLIBNAME)
# OpenGL demos...
CubeView$(EXEEXT): CubeMain.o CubeView.o CubeViewUI.o