Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-05-28 19:35:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

More Cygwin DLL fixes (STR #1585)

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5682 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2007-02-08 21:22:32 +00:00
parent 1b7589dace
commit 057e542c39
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+10 -2
View File
@@ -80,6 +80,7 @@ case $uname in
CPPFLAGS="$CPPFLAGS -mno-cygwin" CPPFLAGS="$CPPFLAGS -mno-cygwin"
CXXFLAGS="$CXXFLAGS -mno-cygwin" CXXFLAGS="$CXXFLAGS -mno-cygwin"
LDFLAGS="$LDFLAGS -mno-cygwin" LDFLAGS="$LDFLAGS -mno-cygwin"
DSOFLAGS="$DSOFLAGS -mno-cygwin"
fi fi
;; ;;
esac esac
@@ -204,7 +205,14 @@ if test x$enable_shared = xyes; then
GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll" GLDSONAME="cygfltknox_gl-$FL_API_VERSION.dll"
IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll" IMGDSONAME="cygfltknox_images-$FL_API_VERSION.dll"
fi fi
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared -Wl,--whole-archive -Wl,--export-all-symbols -Wl,--enable-auto-import -Wl,--enable-auto-image-base -o \$@" #-----------------------------------------------------------
# -Wl,--enable-runtime-pseudo-reloc: See str 1585
# appears to be necessary for older binutils versions < 2.16
#-----------------------------------------------------------
DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -shared \
-Wl,--whole-archive -Wl,--export-all-symbols \
-Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-import \
-Wl,--enable-auto-image-base -o \$@"
;; ;;
*) *)
AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.) AC_MSG_WARN(Shared libraries may not be supported. Trying -shared option with compiler.)
@@ -599,8 +607,8 @@ case $uname in
CFLAGS="-mwindows -DWIN32 $CFLAGS" CFLAGS="-mwindows -DWIN32 $CFLAGS"
CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS" CXXFLAGS="-mwindows -DWIN32 $CXXFLAGS"
LDFLAGS="-mwindows $LDFLAGS" LDFLAGS="-mwindows $LDFLAGS"
DSOFLAGS="-mwindows $DSOFLAGS"
LIBS="$LIBS -lole32 -luuid -lcomctl32 -lwsock32" LIBS="$LIBS -lole32 -luuid -lcomctl32 -lwsock32"
DSOFLAGS="-mwindows"
OPTIM="$OPTIM" OPTIM="$OPTIM"
if test x$enable_gl != xno; then if test x$enable_gl != xno; then
src/Makefile
+10 -4
View File
@@ -372,10 +372,11 @@ cygfltknox_gl-1.1.dll: $(GLLIBNAME) cygfltknox-1.1.dll
-L. -lfltk $(GLDLIBS) -L. -lfltk $(GLDLIBS)
cygfltknox_images-1.1.dll: $(IMGLIBNAME) cygfltknox-1.1.dll cygfltknox_images-1.1.dll: $(IMGLIBNAME) cygfltknox-1.1.dll
echo $(DSOCOMMAND) ../lib/libfltk_images ... echo $(DSOCOMMAND) $(IMGLIBNAME) ...
$(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \ -Wl,--out-implib=libfltk_images.dll.a \
-L. -lfltk -ljpeg -lpng -lz $(LDLIBS) -L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
$(IMAGELIBS) $(LDLIBS)
mgwfltknox-1.1.dll: $(LIBNAME) mgwfltknox-1.1.dll: $(LIBNAME)
echo $(DSOCOMMAND) $(LIBNAME) ... echo $(DSOCOMMAND) $(LIBNAME) ...
@@ -394,14 +395,19 @@ mgwfltknox_gl-1.1.dll: $(GLLIBNAME) mgwfltknox-1.1.dll
-Wl,--out-implib=libfltk_gl.dll.a \ -Wl,--out-implib=libfltk_gl.dll.a \
-L. -lfltk $(GLDLIBS) -L. -lfltk $(GLDLIBS)
#-----------------------------------------------------
# See STR #1585 for --exclude-libs
#-----------------------------------------------------
mgwfltknox_images-1.1.dll: $(IMGLIBNAME) mgwfltknox-1.1.dll mgwfltknox_images-1.1.dll: $(IMGLIBNAME) mgwfltknox-1.1.dll
echo $(DSOCOMMAND) $(IMGLIBNAME) ... echo $(DSOCOMMAND) $(IMGLIBNAME) ...
$(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \ $(DSOCOMMAND) $(IMGLIBNAME) -Wl,--no-whole-archive \
-Wl,--out-implib=libfltk_images.dll.a \ -Wl,--out-implib=libfltk_images.dll.a \
-L. -lfltk -ljpeg -lpng -lz $(LDLIBS) -L. -lfltk -Wl,--exclude-libs -Wl,libfltk_png.a \
$(IMAGELIBS) $(LDLIBS)
clean: clean:
-$(RM) *.o core.* *~ *.bck *.bck -$(RM) *.o *.dll.a core.* *~ *.bck *.bck
-$(RM) $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \ -$(RM) $(DSONAME) $(FLDSONAME) $(GLDSONAME) $(IMGDSONAME) \
../lib/$(LIBNAME) ../lib/$(FLLIBNAME) ../lib/$(GLLIBNAME) \ ../lib/$(LIBNAME) ../lib/$(FLLIBNAME) ../lib/$(GLLIBNAME) \
../lib/$(IMGLIBNAME) \ ../lib/$(IMGLIBNAME) \