diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-16 20:19:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-10-16 20:19:22 +0000 |
| commit | ea60692bf5e0dcf30b9fac3a777f115c059133ab (patch) | |
| tree | 34c2212cc7b5901a6db5705e174df37d7e987954 /makefiles/makeinclude.mingw | |
| parent | 90784b7e651c27a4ba1b6de21379d77aa6b0d6d7 (diff) | |
Fixes for the Cygwin, MingW, and OS/2 build stuff.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1634 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'makefiles/makeinclude.mingw')
| -rw-r--r-- | makefiles/makeinclude.mingw | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/makefiles/makeinclude.mingw b/makefiles/makeinclude.mingw index 11f995fe1..41e48d448 100644 --- a/makefiles/makeinclude.mingw +++ b/makefiles/makeinclude.mingw @@ -1,5 +1,5 @@ # -# "$Id: makeinclude.mingw,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $" +# "$Id: makeinclude.mingw,v 1.1.2.3.2.1 2001/10/16 20:19:22 easysw Exp $" # # Make include file for the Fast Light Tool Kit (FLTK). # @@ -62,7 +62,8 @@ CFLAGS = -Wall -O2 -DWIN32 CXXFLAGS = -Wall -O2 -DWIN32 # program to make the archive: -LIBNAME = libfltk.a +LIBNAME = ../lib/libfltk.a +GLLIBNAME = ../lib/libfltk_gl.a LIBCOMMAND = ar -ruv RANLIB = ranlib DSONAME = @@ -71,6 +72,9 @@ DSOCOMMAND = echo # libraries to link with (in addition to default libs): LDLIBS = -lgdi32 -lwsock32 GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32 +LINKFLTK =-L../lib -lfltk +LINKFLTKGL =-L../lib -lfltk_gl +IMAGELIBS = # Be quiet when building... .SILENT: @@ -80,7 +84,7 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32 .cxx: echo Compiling and linking $@... - $(CXX) -I.. -L../lib $(CXXFLAGS) $< -lfltk $(LDLIBS) -o $@ + $(CXX) -I.. $(CXXFLAGS) $< $(LINKFLTK) $(LDLIBS) -o $@ .c.o: echo Compiling $@... @@ -91,5 +95,5 @@ GLDLIBS = -lglu32 -lopengl32 -lgdi32 -lwsock32 $(CXX) -I.. $(CXXFLAGS) $< -c # -# End of "$Id: makeinclude.mingw,v 1.1.2.3 2001/01/22 15:13:39 easysw Exp $". +# End of "$Id: makeinclude.mingw,v 1.1.2.3.2.1 2001/10/16 20:19:22 easysw Exp $". # |