diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-10-18 20:22:25 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-10-18 20:22:25 +0000 |
| commit | bf910884ccd3b3fb0655799feee83adcbc35a3a9 (patch) | |
| tree | e48c4008467d4320381e26027b79fda5a410dc5d /makefiles | |
| parent | f7fd28ddfc97f5ff289ad6e916d012848583c192 (diff) | |
Documentation updates (STR #570)
Added DESTDIR support and now remove all man pages for the
"uninstall" target (STR #545)
Fix PNG drawing on buggy WIN32 graphics cards (STR #548)
The configure script didn't propagate the CPPFLAGS environment
variable (STR #549)
The numpad keys didn't work properly on WIN32 (STR #502)
fl_input() and friends now set the input focus to the text field
when the dialog is shown (STR #553)
Fixed background color mixup when drawing Fl_Choice menus (STR
#544)
Fixed MingW makefiles (STR #550)
More VC++ project file tweaking (STR #559)
Fl_PNG_Image didn't use the png_set_trns_to_alpha function when
available (STR #547)
The FL_UNFOCUS event wasn't always sent when switching tabs (STR
#558)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3868 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'makefiles')
| -rw-r--r-- | makefiles/Makefile.mingw | 22 | ||||
| -rw-r--r-- | makefiles/makeinclude.mingw | 31 |
2 files changed, 44 insertions, 9 deletions
diff --git a/makefiles/Makefile.mingw b/makefiles/Makefile.mingw index 9586c982f..82ff02ab4 100644 --- a/makefiles/Makefile.mingw +++ b/makefiles/Makefile.mingw @@ -1,5 +1,5 @@ # -# "$Id: Makefile.mingw,v 1.1.2.2 2001/01/22 15:13:39 easysw Exp $" +# "$Id: Makefile.mingw,v 1.1.2.2.2.1 2004/10/18 20:22:22 easysw Exp $" # # Top-level makefile for the Fast Light Tool Kit (FLTK). # @@ -44,6 +44,15 @@ all: makeinclude config.h + echo "=== making zlib ===" + touch zlib/makedepend + cd zlib ; $(MAKE) + echo "=== making jpeg ===" + touch jpeg/makedepend + cd jpeg ; $(MAKE) + echo "=== making png ===" + touch png/makedepend + cd png ; $(MAKE) echo "=== making src ===" touch src/makedepend cd src ; $(MAKE) @@ -55,6 +64,15 @@ all: makeinclude config.h cd test ; $(MAKE) install: + echo "=== installing zlib ===" + touch zlib/makedepend + cd zlib ; $(MAKE) install + echo "=== installing jpeg ===" + touch jpeg/makedepend + cd jpeg ; $(MAKE) install + echo "=== installing png ===" + touch png/makedepend + cd png ; $(MAKE) install echo "=== installing src ===" touch src/makedepend cd src ; $(MAKE) install @@ -92,5 +110,5 @@ makeinclude: makefiles/makeinclude.mingw cp $< $@ # -# End of "$Id: Makefile.mingw,v 1.1.2.2 2001/01/22 15:13:39 easysw Exp $". +# End of "$Id: Makefile.mingw,v 1.1.2.2.2.1 2004/10/18 20:22:22 easysw Exp $". # diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw index a6a8643b4..5891334b9 100644 --- a/makefiles/makeinclude.mingw +++ b/makefiles/makeinclude.mingw @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.mingw,v 1.1.2.3.2.13 2004/07/23 19:26:26 easysw Exp $" +# "$Id: makeinclude.mingw,v 1.1.2.3.2.14 2004/10/18 20:22:22 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # (this file for MingW using GCC 2.95.x) @@ -95,8 +95,15 @@ GLDLIBS =-mwindows -lglu32 -lopengl32 -lole32 -luuid -lcomctl32 -lwsock32 -lsup LINKFLTK =-L../lib -lfltk LINKFLTKGL =-L../lib -lfltk_gl LINKFLTKFORMS =-L../lib -lfltk_forms -lfltk -LINKFLTKIMG =-L../lib -lfltk_images -lfltk -IMAGELIBS = +LINKFLTKIMG =-L../lib -lfltk_images -lfltk $(IMAGELIBS) +LINKSHARED = -L../lib -lfltk_images -lfltk_forms -lfltk $(IMAGELIBS) +IMAGELIBS =-lfltk_png -lfltk_z -lfltk_jpeg + +# image libraries to build... +IMAGEDIRS = jpeg zlib png + +# The extension to use for executables... +EXEEXT = .exe # Do we build the OpenGL demos? GLDEMOS =gldemos @@ -104,6 +111,16 @@ GLDEMOS =gldemos # Do we build the threads demo? THREADS =threads +# Name of FLUID executable we install +FLUID = fluid$(EXEEXT) + +# Possible steps after linking... +POSTBUILD = : + +# Man page extensions... +CAT1EXT = 1 +CAT3EXT = 3 + # Be quiet when building... .SILENT: @@ -112,16 +129,16 @@ THREADS =threads .cxx: echo Compiling and linking $@... - $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ + $(CXX) -I.. -I../png -I../jpeg -I../zlib $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ .c.o: echo Compiling $@... - $(CC) -I.. $(CXXFLAGS) $< -c + $(CC) -I.. -I../png -I../jpeg -I../zlib $(CXXFLAGS) $< -c .cxx.o: echo Compiling $@... - $(CXX) -I.. $(CXXFLAGS) $< -c + $(CXX) -I.. -I../png -I../jpeg -I../zlib $(CXXFLAGS) $< -c # -# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.13 2004/07/23 19:26:26 easysw Exp $". +# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.14 2004/10/18 20:22:22 easysw Exp $". # |