X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea258ad3489638fbcf504a674f8793b1362bd2b5..5d25c05039a7c6ebbddfe16d99234dc756e75356:/src/xpm/MAKEFILE.VA

diff --git a/src/xpm/MAKEFILE.VA b/src/xpm/MAKEFILE.VA
index 9f7c573468..eaf1200223 100644
--- a/src/xpm/MAKEFILE.VA
+++ b/src/xpm/MAKEFILE.VA
@@ -13,7 +13,7 @@
 OBJSUFF=obj
 SRCSUFF=cpp
 
-OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Dwx_msw /Ss /Q /N100
+OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP30__ /Dwx_msw /Q /N100
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
@@ -111,6 +111,23 @@ LIBOBJECTS = \
   wrffrdat.obj \
   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      $(OS2XPMLIB)
+        erase /N $(OS2XPMDIR)\$D
+        rd       $(OS2XPMDIR)\$D
+
+cleanall:     clean
+
 $(LIBOBJECTS):
   copy ..\xpm\$D\attrib.obj
   copy ..\xpm\$D\crbuffri.obj
@@ -132,20 +149,3 @@ $(LIBOBJECTS):
   copy ..\xpm\$D\wrffrdat.obj
   copy ..\xpm\$D\wrffri.obj
 
-all:  $(OS2XPMLIB)
-
-$(WXDIR)\lib\os2xpm.lib: $(LIBOBJECTS)
- touch $(WXDIR)\lib\os2xpm.lib
- del $(WXDIR)\lib\os2xpm.lib
- ilib $(OS2LIBFLAGS) $@ @<<
-    $**;
-<<
-  del *.obj
-
-clean:
-        del      $(OS2XPMLIB)
-        erase /N $(OS2XPMDIR)\$D
-        rd       $(OS2XPMDIR)\$D
-
-cleanall:     clean
-