DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW.
[STR New]
Link: http://www.fltk.org/str.php?L1610
Version: 2.0-current
Link: http://www.fltk.org/str.php?L1610
Version: 2.0-current
Index: makeinclude.in
===================================================================
--- makeinclude.in (revision 7706)
+++ makeinclude.in (working copy)
@@ -79,11 +79,11 @@
# libraries to link with:
LDLIBS = @LDFLAGS@ @LIBS@
GLDLIBS = @LDFLAGS@ @GLLIB@ @LIBS@
-LINKFLTK = -L../lib @LINKFLTK@
-LINKFLTKGL = -L../lib @LINKFLTKGL@ @LINKFLTK@
-LINKFLTKFORMS = -L../lib -lfltk2_forms @LINKFLTK@
+LINKFLTK = @LINKFLTK@
+LINKFLTKGL = @LINKFLTKGL@ @LINKFLTK@
+LINKFLTKFORMS = L../lib -lfltk2_forms @LINKFLTK@
LOCAL_IMAGELIBS = @LOCAL_IMAGELIBS@
-LINKFLTKIMG = -L../lib -lfltk2_images @LINKFLTK@ $(LOCAL_IMAGELIBS)
$(IMAGELIBS)
+LINKFLTKIMG = @LINKFLTKIMG@ @LINKFLTK@ $(LOCAL_IMAGELIBS) $(IMAGELIBS)
LINKSHARED = @DSOLINK@ @LINKSHARED@ $(IMAGELIBS)
IMAGELIBS = @IMAGELIBS@
@@ -104,8 +104,8 @@
THREADS = @THREADS@
# Name of FLUID executable we install
-#FLUID = @fl...@$(EXEEXT)
-FLUID = fluid2$(EXEEXT)
+FLUID = @fl...@$(EXEEXT)
+#FLUID = fluid2$(EXEEXT)
# Possible steps after linking...
POSTBUILD = @POSTBUILD@
Index: configure.in
===================================================================
--- configure.in (revision 7706)
+++ configure.in (working copy)
@@ -89,9 +89,9 @@
AC_SUBST(GLDEMOS)
-LINKFLTK="-lfltk2"
-LINKFLTKGL="-lfltk2_gl"
-LINKFLTKIMG="-lfltk2_images"
+LINKFLTK="../lib/libfltk2.a"
+LINKFLTKGL="../lib/libfltk2_gl.a"
+LINKFLTKIMG="../lib/libfltk2_images.a"
AC_SUBST(LINKFLTK)
AC_SUBST(LINKFLTKGL)
@@ -219,7 +219,7 @@
esac
# LINKSHARED="-L../images -lfltk2_images$SHAREDSUFFIX -L../forms
-lfltk2_forms$SHAREDSUFFIX -L../src -lfltk2$SHAREDSUFFIX"
- LINKSHARED="-L../images -lfltk2_images$SHAREDSUFFIX -L../src
-lfltk2$SHAREDSUFFIX"
+ LINKSHARED="-L../lib -lfltk2_images$SHAREDSUFFIX -lfltk2$SHAREDSUFFIX"
else
DSOCOMMAND="echo"
DSOLINK=""
@@ -227,7 +227,7 @@
SHAREDSUFFIX=""
FLUID="fluid2"
# LINKSHARED="-L../lib -lfltk2_images -lfltk2_forms -lfltk2"
- LINKSHARED="-L../lib -lfltk2_images -lfltk2"
+ LINKSHARED=" ../lib/libfltk2_images$LIBSUFFIX ../lib/libfltk2$LIBSUFFIX"
fi
AC_SUBST(DSOCOMMAND)
@@ -433,7 +433,7 @@
dnl Check for image libraries...
SAVELIBS="$LIBS"
-IMAGELIBS="-lfltk2_images"
+IMAGELIBS=""
AC_ARG_ENABLE(jpeg, [ --enable-jpeg turn on JPEG support:
auto,no,local (default=auto)])
if test x$enable_jpeg != xno; then
Index: fluid/Makefile
===================================================================
--- fluid/Makefile (revision 7706)
+++ fluid/Makefile (working copy)
@@ -110,6 +110,7 @@
fluid2$(EXEEXT): $(OBJECTS) ../lib/$(LIBPREFIX)fltk2$(LIBSUFFIX) \
../lib/$(LIBPREFIX)fltk2_images$(LIBSUFFIX)
echo Linking $...@...
+ echo $(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LIBS)
$(LDLIBS) $(LOCAL_IMAGELIBS)
$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKIMG) $(LIBS) $(LDLIBS)
$(LOCAL_IMAGELIBS)
$(POSTBUILD) $@ ../fltk/mac.r
@@ -118,8 +119,8 @@
# Build shared FLUID...
#
-fluid2-shared$(EXEEXT): $(OBJECTS) ../src/$(DSOPREFIX)fltk2$(DSOSUFFIX) \
- ../images/$(DSOPREFIX)fltk2_images$(DSOSUFFIX)
+fluid2-shared$(EXEEXT): $(OBJECTS) ../lib/$(DSOPREFIX)fltk2$(DSOSUFFIX) \
+ ../lib/$(DSOPREFIX)fltk2_images$(DSOSUFFIX)
echo Linking $...@...
$(CXX) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKSHARED) $(IMAGELIBS)
$(LOCAL_IMAGELIBS) $(LIBS) $(LDLIBS)
$(POSTBUILD) $@ ../fltk/mac.r
_______________________________________________
fltk-bugs mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-bugs
