Search
j0ke.net Open Build Service
>
Projects
>
multimedia
>
fltk
> fltk-1.1.9-libdir.patch
Sign Up
|
Log In
Username
Password
Cancel
Overview
Repositories
Revisions
Requests
Users
Advanced
Attributes
Meta
File fltk-1.1.9-libdir.patch of Package fltk
--- configure.in +++ configure.in @@ -78,17 +78,17 @@ esac dnl Define the libraries and link options we'll need. -LINKFLTK="../lib/libfltk.a" -LINKFLTKFORMS="../lib/libfltk_forms.a" -LINKFLTKGL="../lib/libfltk_gl.a" -LINKFLTKIMG="../lib/libfltk_images.a" +LINKFLTK="../lib64/libfltk.a" +LINKFLTKFORMS="../lib64/libfltk_forms.a" +LINKFLTKGL="../lib64/libfltk_gl.a" +LINKFLTKIMG="../lib64/libfltk_images.a" GLDEMOS="gldemos" LIBEXT=".a" -LIBNAME="../lib/libfltk.a" -FLLIBNAME="../lib/libfltk_forms.a" -GLLIBNAME="../lib/libfltk_gl.a" -IMGLIBNAME="../lib/libfltk_images.a" +LIBNAME="../lib64/libfltk.a" +FLLIBNAME="../lib64/libfltk_forms.a" +GLLIBNAME="../lib64/libfltk_gl.a" +IMGLIBNAME="../lib64/libfltk_images.a" AC_SUBST(FLLIBNAME) AC_SUBST(GLDEMOS) @@ -220,7 +220,7 @@ PICFLAG=0 SHAREDSUFFIX="" FLUID="fluid" - LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a" + LINKSHARED="../lib64/libfltk_images.a ../lib64/libfltk_forms.a ../lib64/libfltk.a" fi AC_SUBST(DSOCOMMAND) --- fluid/Makefile +++ fluid/Makefile @@ -54,8 +54,8 @@ all: $(FLUID) fluid$(EXEEXT) -fluid$(EXEEXT): $(OBJECTS) ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) \ - ../lib/$(IMGLIBNAME) +fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ + $(IMGLIBNAME) echo Linking $@... $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r --- test/Makefile +++ test/Makefile @@ -233,7 +233,7 @@ ../fluid/fluid$(EXEEXT) -c $< # All demos depend on the FLTK library... -$(ALL): ../lib/$(LIBNAME) +$(ALL): $(LIBNAME) # General demos... unittests$(EXEEXT): unittests.o @@ -288,7 +288,7 @@ fast_slow$(EXEEXT): fast_slow.o fast_slow.cxx: fast_slow.fl -file_chooser$(EXEEXT): file_chooser.o ../lib/$(IMGLIBNAME) +file_chooser$(EXEEXT): file_chooser.o $(IMGLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) file_chooser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -302,7 +302,7 @@ hello$(EXEEXT): hello.o -help$(EXEEXT): help.o ../lib/$(IMGLIBNAME) +help$(EXEEXT): help.o $(IMGLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) help.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -349,7 +349,7 @@ navigation$(EXEEXT): navigation.o -output$(EXEEXT): output.o ../lib/$(FLLIBNAME) +output$(EXEEXT): output.o $(FLLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) -o $@ output.o $(LINKFLTKFORMS) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -360,7 +360,7 @@ pixmap$(EXEEXT): pixmap.o -pixmap_browser$(EXEEXT): pixmap_browser.o ../lib/$(IMGLIBNAME) +pixmap_browser$(EXEEXT): pixmap_browser.o $(IMGLIBNAME) echo Linking $@... $(CXX) -I.. $(CXXFLAGS) pixmap_browser.o -o $@ $(LINKFLTKIMG) $(LDLIBS) $(POSTBUILD) $@ ../FL/mac.r @@ -409,7 +409,7 @@ valuators.cxx: valuators.fl # 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
