Reverted change to DrawLine so it doesn't draw the last point (sorry!)

[wxWidgets.git] / src / xpm / MAKEFILE.VA

diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA
index f4bd88233c686a30f00f853d080a93cb6b7215b4..0aecccdd905c85b044f31354ac3a98bd34692fa1 100644 (file)
--- a/src/xpm/MAKEFILE.VA
+++ b/src/xpm/MAKEFILE.VA
@@ -13,13 +13,13 @@
 OBJSUFF=obj
 SRCSUFF=cpp
 
-OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /Dwx_msw /Ss /Q /N100
+OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Dwx_msw /Q /N100
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
-WXDIR = h:\dev\wx2\wxWindows
+WXDIR = $(WXWIN)
 
 OS2XPMDIR=$(WXDIR)\src\xpm
 OS2XPMINC=$(WINXPMDIR)
@@ -42,7 +42,7 @@ MAKEPRECOMP=/Fi$(PCH)
 !endif
 
 !if "$(FINAL)" == "0"
-D=Debug
+D=DebugOS2
 OPT =
 DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
 LINK_DEBUG_FLAGS=/DEBUG
@@ -50,7 +50,7 @@ CRTFLAG=/Gm /Gd
 !else
 # /O1 - smallest code
 # /O2 - fastest code
-D=Release
+D=RelseOS2
 OPT = /O+ /Oc /G5
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
@@ -70,12 +70,15 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 <<
 
 OBJECTS = \
+  ..\xpm\$D\attrib.obj \
   ..\xpm\$D\crbuffri.obj \
   ..\xpm\$D\crdatfri.obj \
   ..\xpm\$D\create.obj \
   ..\xpm\$D\crifrbuf.obj \
   ..\xpm\$D\crifrdat.obj \
   ..\xpm\$D\data.obj \
+  ..\xpm\$D\image.obj \
+  ..\xpm\$D\info.obj \
   ..\xpm\$D\hashtab.obj \
   ..\xpm\$D\misc.obj \
   ..\xpm\$D\parse.obj \
@@ -85,22 +88,64 @@ OBJECTS = \
   ..\xpm\$D\scan.obj \
   ..\xpm\$D\simx.obj \
   ..\xpm\$D\wrffrdat.obj \
-  ..\xpm\$D\wrffrp.obj \
   ..\xpm\$D\wrffri.obj
 
-all:  $(OS2XPMLIB)
-
-$(WXDIR)\lib\os2xpm.lib: $(OBJECTS)
+LIBOBJECTS = \
+  attrib.obj \
+  crbuffri.obj \
+  crdatfri.obj \
+  create.obj \
+  crifrbuf.obj \
+  crifrdat.obj \
+  data.obj \
+  image.obj \
+  info.obj \
+  hashtab.obj \
+  misc.obj \
+  parse.obj \
+  rdftodat.obj \
+  rdftoi.obj \
+  rgb.obj \
+  scan.obj \
+  simx.obj \
+  wrffrdat.obj \
+  wrffri.obj
+
+$(LIBOBJECTS):
+  copy ..\xpm\$D\attrib.obj
+  copy ..\xpm\$D\crbuffri.obj
+  copy ..\xpm\$D\crdatfri.obj
+  copy ..\xpm\$D\create.obj
+  copy ..\xpm\$D\crifrbuf.obj
+  copy ..\xpm\$D\crifrdat.obj
+  copy ..\xpm\$D\data.obj
+  copy ..\xpm\$D\image.obj
+  copy ..\xpm\$D\info.obj
+  copy ..\xpm\$D\hashtab.obj
+  copy ..\xpm\$D\misc.obj
+  copy ..\xpm\$D\parse.obj
+  copy ..\xpm\$D\rdftodat.obj
+  copy ..\xpm\$D\rdftoi.obj
+  copy ..\xpm\$D\rgb.obj
+  copy ..\xpm\$D\scan.obj
+  copy ..\xpm\$D\simx.obj
+  copy ..\xpm\$D\wrffrdat.obj
+  copy ..\xpm\$D\wrffri.obj
+
+all:  $(OBJECTS) $(OS2XPMLIB)
+
+$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
  touch $(WXDIR)\lib\os2xpm.lib
  del $(WXDIR)\lib\os2xpm.lib
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
+  del *.obj
 
 clean:
-        del *.obj
-        del *.exe
-        del *.lib
+        del      $(OS2XPMLIB)
+        erase /N $(OS2XPMDIR)\$D
+        rd       $(OS2XPMDIR)\$D
 
 cleanall:     clean