removed assert which could be provoked by correct code

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

diff --git a/src/jpeg/MAKEFILE.VA b/src/jpeg/MAKEFILE.VA
index b4926a384fcec9c26354671e0d50d3896c5b15d4..803a38b09e4b949e8a8087ed3662521db3f3395a 100644 (file)
--- a/src/jpeg/MAKEFILE.VA
+++ b/src/jpeg/MAKEFILE.VA
@@ -13,17 +13,26 @@
 OBJSUFF=obj
 SRCSUFF=cpp
 
 OBJSUFF=obj
 SRCSUFF=cpp
 

-OS2FLAGS=/c /W3 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100
+OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /D__WXPM__ /DJPEGLOCAL /Ss /Q /N100 /Tdc

 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
 
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
 

+!if "$(WXMAKINGDLL)" != "0"
+EXTRADLLFLAGS=/DWXMAKINGDLL=1 /Ge- /D__OS2DLL__
+EXTRALNKFLAGS=/DLL
+!endif
+

 # Change WXDIR or WXWIN to wherever wxWindows is found
 # Change WXDIR or WXWIN to wherever wxWindows is found

-WXDIR = j:\dev\wx2\wxWindows
+WXDIR = $(WXWIN)

 
 OS2JPEGDIR=$(WXDIR)\src\jpeg
 OS2JPEGINC=$(WINJPEGDIR)
 
 OS2JPEGDIR=$(WXDIR)\src\jpeg
 OS2JPEGINC=$(WINJPEGDIR)

+!if "$(WXMAKINGDLL)" != "1"

 OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.lib
 OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.lib

+!else
+OS2JPEGLIB=$(WXDIR)\lib\os2jpeg.dll
+!endif

 
 TEMP1TGT=$(WXDIR)\lib\os2jpeg1.lib
 TEMP2TGT=$(WXDIR)\lib\os2jpeg2.lib
 
 TEMP1TGT=$(WXDIR)\lib\os2jpeg1.lib
 TEMP2TGT=$(WXDIR)\lib\os2jpeg2.lib


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

-D=Debug
+!if "$(WXMAKINGDLL)" == "1"
+D=DebugOS2DLL
+!else
+D=DebugOS2
+!endif
+

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


@@ -52,7 +66,11 @@ CRTFLAG=/Gm /Gd
 !else
 # /O1 - smallest code
 # /O2 - fastest code
 !else
 # /O1 - smallest code
 # /O2 - fastest code

-D=Release
+!if "$(WXMAKINGDLL)" == "1"
+D=RelseOS2DLL
+!else
+D=RelseOS2
+!endif

 OPT = /O+ /Oc /G5
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
 OPT = /O+ /Oc /G5
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE


@@ -62,7 +80,8 @@ CRTFLAG=/Gm /Gd
 !if [md $(OS2JPEGDIR)\$D]
 !endif
 
 !if [md $(OS2JPEGDIR)\$D]
 !endif
 

-CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
+CPPFLAGS=$(OS2FLAGS) $(EXTRADLLFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
+LINKFKAGS=$(OS2LINKFLAGS) $(EXTRALNKFLAGS)

 
 {..\jpeg}.c{..\jpeg\$D}.obj:
     @echo $<
 
 {..\jpeg}.c{..\jpeg\$D}.obj:
     @echo $<


@@ -263,18 +282,20 @@ $(DLIBLIBOBJS):
   copy ..\jpeg\$D\jquant2.obj
   copy ..\jpeg\$D\jdmerge.obj
 
   copy ..\jpeg\$D\jquant2.obj
   copy ..\jpeg\$D\jdmerge.obj
 

+!if "$(WXMAKINGDLL)" != "1"
+

 $(WXDIR)\lib\os2jpeg1.lib: \
     $(COMLIBOBJS) \
     $(CLIBLIBOBJS)
 $(WXDIR)\lib\os2jpeg1.lib: \
     $(COMLIBOBJS) \
     $(CLIBLIBOBJS)

- touch $(WXDIR)\lib\os2jpeg1.lib
- del $(WXDIR)\lib\os2jpeg1.lib
+ -touch $(WXDIR)\lib\os2jpeg1.lib
+ -del $(WXDIR)\lib\os2jpeg1.lib

  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
 
 $(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)

- touch $(WXDIR)\lib\os2jpeg2.lib
- del $(WXDIR)\lib\os2jpeg2.lib
+ -touch $(WXDIR)\lib\os2jpeg2.lib
+ -del $(WXDIR)\lib\os2jpeg2.lib

  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<


@@ -282,8 +303,8 @@ $(WXDIR)\lib\os2jpeg2.lib: $(DLIBLIBOBJS)
 $(WXDIR)\lib\os2jpeg.lib: \
     $(TEMP1TGT) \
     $(TEMP2TGT)
 $(WXDIR)\lib\os2jpeg.lib: \
     $(TEMP1TGT) \
     $(TEMP2TGT)

- touch $(WXDIR)\lib\os2jpeg.lib
- del $(WXDIR)\lib\os2jpeg.lib
+ -touch $(WXDIR)\lib\os2jpeg.lib
+ -del $(WXDIR)\lib\os2jpeg.lib

  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<
  ilib $(OS2LIBFLAGS) $@ @<<
     $**;
 <<


@@ -291,6 +312,20 @@ $(WXDIR)\lib\os2jpeg.lib: \
   del $(TEMP1TGT)
   del $(TEMP2TGT)
 
   del $(TEMP1TGT)
   del $(TEMP2TGT)
 

+!else
+
+# Update the dynamic link library
+$(WXDIR)\lib\os2jpeg.dll: $(OBJECTS)
+    icc @<<
+    /B" $(LINKFLAGS)" /Fe$@
+    $(LIBS)
+    $(OBJECTS)
+    $(WXDIR)\src\os2\os2jpeg.def
+<<
+    implib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\src\os2\os2jpeg.def
+
+!endif
+

 clean:
         del      $(OS2JPEGLIB)
         erase /N $(OS2JPEGDIR)\$D
 clean:
         del      $(OS2JPEGLIB)
         erase /N $(OS2JPEGDIR)\$D