summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES3
-rw-r--r--makefiles/makeinclude.os2x10
2 files changed, 7 insertions, 6 deletions
diff --git a/CHANGES b/CHANGES
index 5fd4d0286..bcdaa822b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@ CHANGES IN FLTK 1.1.5rc1
- The keypad Enter key works as the normal Enter/Return
key in common widgets (STR #191)
- Doco fixes (STR #186)
- - Fixed some OS/2-specific build problems (STR #185)
+ - Fixed some OS/2-specific build problems (STR #185 and
+ #197)
- Calling Fl_Text_Display::buffer() with the same buffer
would cause an application to lockup (STR #196)
- Some of the widgets could crash an application if the
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 $".
#