summaryrefslogtreecommitdiff
path: root/makefiles/makeinclude.os2x
diff options
context:
space:
mode:
authorMichael R Sweet <michael.r.sweet@gmail.com>2003-11-03 00:36:50 +0000
committerMichael R Sweet <michael.r.sweet@gmail.com>2003-11-03 00:36:50 +0000
commit7615da84bb83093a0cfa925b9b8004c385074e62 (patch)
tree81504e5e895770307d59814aa2f6b3a7ca55185a /makefiles/makeinclude.os2x
parent5d135b3928e770b88b6a42ebf901684b8196f60b (diff)
Another bunch of OS/2 changes (STR #197)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3125 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'makefiles/makeinclude.os2x')
-rw-r--r--makefiles/makeinclude.os2x10
1 files changed, 5 insertions, 5 deletions
diff --git a/makefiles/makeinclude.os2x b/makefiles/makeinclude.os2x
index 9356c0759..fe051d828 100644
--- a/makefiles/makeinclude.os2x
+++ b/makefiles/makeinclude.os2x
@@ -1,5 +1,5 @@
#
-# "$Id: makeinclude.os2x,v 1.1.2.4.2.11 2003/01/30 21:41:10 easysw Exp $"
+# "$Id: makeinclude.os2x,v 1.1.2.4.2.12 2003/11/03 00:36:50 easysw Exp $"
#
# Make include file for the Fast Light Tool Kit (FLTK).
#
@@ -40,7 +40,7 @@ HTMLDOC = htmldoc.exe
LN = :
MKDIR = md
NROFF = nroff
-RM = del
+RM = if exist %1 del %1
RMDIR = rd
STRIP = :
@@ -73,8 +73,8 @@ GLDLIBS = -s -Zmt -Zcrtdll -Zbsd-signals -lXext -lX11 -lsocket -lshm
LINKFLTK = ../lib/libfltk.a
LINKFLTKGL = -L../lib
LINKFLTKFORMS = ../lib/libfltk_forms.a ../lib/libfltk.a
-LINKFLTKIMG = ../lib/libfltk_images.a ../lib/libfltk.a
IMAGELIBS = -lpng -ljpeg -lz
+LINKFLTKIMG = ../lib/libfltk_images.a $(IMAGELIBS) ../lib/libfltk.a
# Do we build the OpenGL demos?
GLDEMOS =
@@ -86,7 +86,7 @@ THREADS =
EXEEXT =.exe
# Possible steps after linking...
-POSTBUILD =:
+POSTBUILD = touch
# Man page extensions...
CAT1EXT =1
@@ -124,5 +124,5 @@ CAT3EXT =3
mv t.z $@
#
-# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.11 2003/01/30 21:41:10 easysw Exp $".
+# End of "$Id: makeinclude.os2x,v 1.1.2.4.2.12 2003/11/03 00:36:50 easysw Exp $".
#