Changed order of #ifdefs to get native version on OS/2, even if

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

diff --git a/src/zlib/MAKEFILE.VA b/src/zlib/MAKEFILE.VA
index 8322d781f65a599aad3cca03913367a93f9d8fb3..e2ba1cdb24ea5ec7e9d708b2015a2903f28ed517 100644 (file)
--- a/src/zlib/MAKEFILE.VA
+++ b/src/zlib/MAKEFILE.VA
@@ -13,13 +13,13 @@
 OBJSUFF=obj
 SRCSUFF=c
 
 OBJSUFF=obj
 SRCSUFF=c
 

-OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /Ss /Q /N100
+OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /Ss /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
 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 = j:\dev\wx2\wxWindows
+WXDIR = $(WXWIN)

 
 OS2ZLIBDIR=$(WXDIR)\src\zlib
 OS2ZLIBINC=$(WINPNGDIR)
 
 OS2ZLIBDIR=$(WXDIR)\src\zlib
 OS2ZLIBINC=$(WINPNGDIR)


@@ -42,7 +42,7 @@ MAKEPRECOMP=/Fi$(PCH)
 !endif
 
 !if "$(FINAL)" == "0"
 !endif
 
 !if "$(FINAL)" == "0"

-D=Debug
+D=DebugOS2

 OPT =
 DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
 LINK_DEBUG_FLAGS=/DEBUG
 OPT =
 DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
 LINK_DEBUG_FLAGS=/DEBUG


@@ -50,13 +50,16 @@ CRTFLAG=/Gm /Gd
 !else
 # /O1 - smallest code
 # /O2 - fastest code
 !else
 # /O1 - smallest code
 # /O2 - fastest code

-D=Release
+D=RelseOS2

 OPT = /O+ /Oc /G5
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
 CRTFLAG=/Gm /Gd
 !endif
 
 OPT = /O+ /Oc /G5
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
 CRTFLAG=/Gm /Gd
 !endif
 

+!if [md $(OS2ZLIBDIR)\$D]
+!endif
+

 CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
 
 {..\zlib}.c{..\zlib\$D}.obj:
 CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
 
 {..\zlib}.c{..\zlib\$D}.obj:


@@ -81,10 +84,7 @@ OBJECTS = \
   ..\zlib\$D\uncompr.obj \
   ..\zlib\$D\zutil.obj
 
   ..\zlib\$D\uncompr.obj \
   ..\zlib\$D\zutil.obj
 

-all: $(OS2ZLIBDIR)\$D  $(OS2ZLIBLIB)
-
-$(OS2ZLIBDIR)\$D:
-       md $(OS2ZLIBDIR)\$D
+all: $(OS2ZLIBLIB)

 
 $(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
  touch $(WXDIR)\lib\os2zlib.lib
 
 $(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
  touch $(WXDIR)\lib\os2zlib.lib


@@ -94,9 +94,9 @@ $(WXDIR)\lib\os2zlib.lib: $(OBJECTS)
 <<
 
 clean:
 <<
 
 clean:

-        del *.obj
-        del *.exe
-        del *.lib
+        del      $(OS2ZLIBLIB)
+        erase /N $(OS2ZLIBDIR)\$D
+        rd       $(OS2ZLIBDIR)\$D

 
 cleanall:     clean
 
 
 cleanall:     clean