mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compilation could fail if a previous installation of FLTK was in

Browse Source 
the same (non-standard) directory as an image library (STR #926)

configure.in:
    - Add LINKFLTKFORMS definition.
    - Change LINKFLTK* definitions to just reference the static
      libraries themselves.

makeinclude.in:
    - Use LINKFLTKFORMS and drop -L../lib stuff for static linking.

src/Makefile:
    - Move -L. in front of LDLIBS and IMGLIBS when linking shared
      libfltk_images.



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4472 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2005-08-08 00:44:38 +00:00
parent 7da5a27b40
commit b8dcdf4c64
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -2,6 +2,9 @@ CHANGES IN FLTK 1.1.7
- Documentation fixes (STR #648, STR #692, STR #730, STR - Documentation fixes (STR #648, STR #692, STR #730, STR
#744, STR #745, STR #942, STR #931) #744, STR #745, STR #942, STR #931)
- Compilation could fail if a previous installation of
FLTK was in the same (non-standard) directory as an
image library (STR #926)
- Fixed OSX compilation problems with non-HFS filesystems - Fixed OSX compilation problems with non-HFS filesystems
(STR #972) (STR #972)
- Problems with CMake on MinGW have been solved, thanks - Problems with CMake on MinGW have been solved, thanks

10
configure.in
View File

@ -80,9 +80,10 @@ case $uname in
esac esac
dnl Define the libraries and link options we'll need. dnl Define the libraries and link options we'll need.
LINKFLTK="-lfltk" LINKFLTK="../lib/libfltk.a"
LINKFLTKGL="-lfltk_gl" LINKFLTKFORMS="../lib/libfltk_forms.a"
LINKFLTKIMG="-lfltk_images" LINKFLTKGL="../lib/libfltk_gl.a"
LINKFLTKIMG="../lib/libfltk_images.a"
GLDEMOS="gldemos" GLDEMOS="gldemos"
LIBEXT=".a" LIBEXT=".a"
@ -98,6 +99,7 @@ AC_SUBST(IMGLIBNAME)
AC_SUBST(LIBEXT) AC_SUBST(LIBEXT)
AC_SUBST(LIBNAME) AC_SUBST(LIBNAME)
AC_SUBST(LINKFLTK) AC_SUBST(LINKFLTK)
AC_SUBST(LINKFLTKFORMS)
AC_SUBST(LINKFLTKGL) AC_SUBST(LINKFLTKGL)
AC_SUBST(LINKFLTKIMG) AC_SUBST(LINKFLTKIMG)
@ -208,7 +210,7 @@ else
PICFLAG=0 PICFLAG=0
SHAREDSUFFIX="" SHAREDSUFFIX=""
FLUID="fluid" FLUID="fluid"
LINKSHARED="-L../lib -lfltk_images -lfltk_forms -lfltk" LINKSHARED="../lib/libfltk_images.a ../lib/libfltk_forms.a ../lib/libfltk.a"
fi fi
AC_SUBST(DSOCOMMAND) AC_SUBST(DSOCOMMAND)

8
makeinclude.in
View File

@ -75,10 +75,10 @@ DSOCOMMAND = @DSOCOMMAND@
# libraries to link with: # libraries to link with:
LDLIBS = @LDFLAGS@ @LIBS@ LDLIBS = @LDFLAGS@ @LIBS@
GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@ GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@
LINKFLTK = -L../lib @LINKFLTK@ LINKFLTK = @LINKFLTK@
LINKFLTKGL = -L../lib @LINKFLTKGL@ LINKFLTKGL = @LINKFLTKGL@
LINKFLTKFORMS = -L../lib -lfltk_forms @LINKFLTK@ LINKFLTKFORMS = @LINKFLTKFORMS@ @LINKFLTK@
LINKFLTKIMG = -L../lib -lfltk_images @LINKFLTK@ $(IMAGELIBS) LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(IMAGELIBS)
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS) LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS)
IMAGELIBS = @IMAGELIBS@ IMAGELIBS = @IMAGELIBS@

6
src/Makefile
View File

@ -310,13 +310,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1 libfltk_images.so.1.1: $(IMGOBJECTS) libfltk.so.1.1
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
$(RM) libfltk_images.so $(RM) libfltk_images.so
$(LN) libfltk_images.so.1.1 libfltk_images.so $(LN) libfltk_images.so.1.1 libfltk_images.so
libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1 libfltk_images.sl.1.1: $(IMGOBJECTS) libfltk.sl.1.1
echo $(DSOCOMMAND) $@ ... echo $(DSOCOMMAND) $@ ...
$(DSOCOMMAND) $@ $(IMGOBJECTS) $(IMAGELIBS) -L. -lfltk $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
$(RM) libfltk_images.sl $(RM) libfltk_images.sl
$(LN) libfltk_images.sl.1.1 libfltk_images.sl $(LN) libfltk_images.sl.1.1 libfltk_images.sl
@ -326,7 +326,7 @@ libfltk_images.1.1.dylib: $(IMGOBJECTS) libfltk.1.1.dylib
-install_name $(libdir)/$@ \ -install_name $(libdir)/$@ \
-current_version 1.1.4 \ -current_version 1.1.4 \
-compatibility_version 1.1.0 \ -compatibility_version 1.1.0 \
$(IMGOBJECTS) $(LDLIBS) -L. $(IMAGELIBS) -lfltk $(IMGOBJECTS) -L.$(LDLIBS) $(IMAGELIBS) -lfltk
$(RM) libfltk_images.dylib $(RM) libfltk_images.dylib
$(LN) libfltk_images.1.1.dylib libfltk_images.dylib $(LN) libfltk_images.1.1.dylib libfltk_images.dylib