No change

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

diff --git a/src/tiff/MAKEFILE.VA b/src/tiff/MAKEFILE.VA
index ae1bee90e59e313f1e55090a638014024d49e666..159f7420ceaf9165831774093a8975f9bb7f1443 100644 (file)
--- a/src/tiff/MAKEFILE.VA
+++ b/src/tiff/MAKEFILE.VA
@@ -3,7 +3,7 @@
 # Author:    David Webster
 # Created:   2000
 # Updated:
-# Copyright: c) 1993, AIAI, University of Edinburgh
+# Copyright: c) 2000, BHM
 #
 # "%W% %G%"
 #
@@ -13,11 +13,16 @@
 OBJSUFF=obj
 SRCSUFF=cpp
 
-OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /DOS2_32 /Q /N100
+OS2FLAGS=/c /W2 /DOS232 /D__VISAGECPP__ /D__VISAGECPP30__ /DOS2_32 /Tdc /Q /N100
 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
 WXDIR = $(WXWIN)
 
@@ -25,6 +30,12 @@ OS2TIFFDIR=$(WXDIR)\src\tiff
 OS2TIFFINC=$(WINTIFFDIR)
 OS2TIFFLIB=$(WXDIR)\lib\os2tiff.lib
 
+!if "$(WXMAKINGDLL)" != "1"
+OS2TIFFLIB=$(WXDIR)\lib\os2tiff.lib
+!else
+OS2TIFFLIB=$(WXDIR)\lib\os2tiff.dll
+!endif
+
 INC=-I$(WXDIR)\src\TIFF -I$(OS2TIFFINC)
 
 !ifndef FINAL
@@ -42,7 +53,11 @@ MAKEPRECOMP=/Fi$(PCH)
 !endif
 
 !if "$(FINAL)" == "0"
+!if "$(WXMAKINGDLL)" == "1"
+D=DebugOS2DLL
+!else
 D=DebugOS2
+!endif
 OPT =
 DEBUG_FLAGS= /Ti /D__WXDEBUG__ #/Fb
 LINK_DEBUG_FLAGS=/DEBUG
@@ -50,7 +65,11 @@ CRTFLAG=/Gm /Gd
 !else
 # /O1 - smallest code
 # /O2 - fastest code
+!if "$(WXMAKINGDLL)" == "1"
+D=RelseOS2DLL
+!else
 D=RelseOS2
+!endif
 OPT = /O+ /Oc /G5
 DEBUG_FLAGS=
 LINK_DEBUG_FLAGS=/RELEASE
@@ -61,7 +80,8 @@ CRTFLAG=/Gm /Gd
 !endif
 
 
-CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
+CPPFLAGS=$(OS2FLAGS) $(EXTRADLLFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(INC) $(OPT) $(CRTFLAG)
+LINKFKAGS=$(OS2LINKFLAGS) $(EXTRALNKFLAGS)
 
 {..\tiff}.c{..\tiff\$D}.obj:
     @echo $<
@@ -89,6 +109,7 @@ OBJECTS = \
   ..\tiff\$D\tif_lzw.obj \
   ..\tiff\$D\tif_next.obj \
   ..\tiff\$D\tif_open.obj \
+  ..\tiff\$D\tif_os2.obj \
   ..\tiff\$D\tif_packbits.obj \
   ..\tiff\$D\tif_pixarlog.obj \
   ..\tiff\$D\tif_predict.obj \
@@ -100,7 +121,6 @@ OBJECTS = \
   ..\tiff\$D\tif_tile.obj \
   ..\tiff\$D\tif_version.obj \
   ..\tiff\$D\tif_warning.obj \
-  ..\tiff\$D\tif_win32.obj \
   ..\tiff\$D\tif_write.obj \
   ..\tiff\$D\tif_zip.obj
 
@@ -124,6 +144,7 @@ LIBOBJECTS = \
   tif_lzw.obj \
   tif_next.obj \
   tif_open.obj \
+  tif_os2.obj \
   tif_packbits.obj \
   tif_pixarlog.obj \
   tif_predict.obj \
@@ -135,12 +156,13 @@ LIBOBJECTS = \
   tif_tile.obj \
   tif_version.obj \
   tif_warning.obj \
-  tif_win32.obj \
   tif_write.obj \
   tif_zip.obj
 
 all:  $(OBJECTS) $(OS2TIFFLIB)
 
+!if "$(WXMAKINGDLL)" != "1"
+
 $(WXDIR)\lib\os2tiff.lib: $(LIBOBJECTS)
  touch $(WXDIR)\lib\os2tiff.lib
  del $(WXDIR)\lib\os2tiff.lib
@@ -149,6 +171,20 @@ $(WXDIR)\lib\os2tiff.lib: $(LIBOBJECTS)
 <<
   del *.obj
 
+!else
+
+# Update the dynamic link library
+$(WXDIR)\lib\os2tiff.dll: $(OBJECTS)
+    icc @<<
+    /B" $(LINKFLAGS)" /Fe$@
+    $(LIBS)
+    $(OBJECTS)
+    $(WXDIR)\src\os2\os2tiff.def
+<<
+    implib $(WXDIR)\lib\os2tiffd.lib $(WXDIR)\src\os2\os2tiff.def
+
+!endif
+
 clean:
         del      $(OS2TIFFLIB)
         erase /N $(OS2TIFFDIR)\$D
@@ -157,37 +193,37 @@ clean:
 cleanall:     clean
 
 $(LIBOBJECTS):
-  copy ..\tiff\$D\tif_aux.obj \
-  copy ..\tiff\$D\tif_close.obj \
-  copy ..\tiff\$D\tif_codec.obj \
-  copy ..\tiff\$D\tif_compress.obj \
-  copy ..\tiff\$D\tif_dir.obj \
-  copy ..\tiff\$D\tif_dirinfo.obj \
-  copy ..\tiff\$D\tif_dirread.obj \
-  copy ..\tiff\$D\tif_dirwrite.obj \
-  copy ..\tiff\$D\tif_dumpmode.obj \
-  copy ..\tiff\$D\tif_error.obj \
-  copy ..\tiff\$D\tif_fax3.obj \
-  copy ..\tiff\$D\tif_fax3sm.obj \
-  copy ..\tiff\$D\tif_flush.obj \
-  copy ..\tiff\$D\tif_getimage.obj \
-  copy ..\tiff\$D\tif_jpeg.obj \
-  copy ..\tiff\$D\tif_luv.obj \
-  copy ..\tiff\$D\tif_lzw.obj \
-  copy ..\tiff\$D\tif_next.obj \
-  copy ..\tiff\$D\tif_open.obj \
-  copy ..\tiff\$D\tif_packbits.obj \
-  copy ..\tiff\$D\tif_pixarlog.obj \
-  copy ..\tiff\$D\tif_predict.obj \
-  copy ..\tiff\$D\tif_print.obj \
-  copy ..\tiff\$D\tif_read.obj \
-  copy ..\tiff\$D\tif_strip.obj \
-  copy ..\tiff\$D\tif_swab.obj \
-  copy ..\tiff\$D\tif_thunder.obj \
-  copy ..\tiff\$D\tif_tile.obj \
-  copy ..\tiff\$D\tif_version.obj \
-  copy ..\tiff\$D\tif_warning.obj \
-  copy ..\tiff\$D\tif_win32.obj \
-  copy ..\tiff\$D\tif_write.obj \
+  copy ..\tiff\$D\tif_aux.obj
+  copy ..\tiff\$D\tif_close.obj
+  copy ..\tiff\$D\tif_codec.obj
+  copy ..\tiff\$D\tif_compress.obj
+  copy ..\tiff\$D\tif_dir.obj
+  copy ..\tiff\$D\tif_dirinfo.obj
+  copy ..\tiff\$D\tif_dirread.obj
+  copy ..\tiff\$D\tif_dirwrite.obj
+  copy ..\tiff\$D\tif_dumpmode.obj
+  copy ..\tiff\$D\tif_error.obj
+  copy ..\tiff\$D\tif_fax3.obj
+  copy ..\tiff\$D\tif_fax3sm.obj
+  copy ..\tiff\$D\tif_flush.obj
+  copy ..\tiff\$D\tif_getimage.obj
+  copy ..\tiff\$D\tif_jpeg.obj
+  copy ..\tiff\$D\tif_luv.obj
+  copy ..\tiff\$D\tif_lzw.obj
+  copy ..\tiff\$D\tif_next.obj
+  copy ..\tiff\$D\tif_open.obj
+  copy ..\tiff\$D\tif_os2.obj
+  copy ..\tiff\$D\tif_packbits.obj
+  copy ..\tiff\$D\tif_pixarlog.obj
+  copy ..\tiff\$D\tif_predict.obj
+  copy ..\tiff\$D\tif_print.obj
+  copy ..\tiff\$D\tif_read.obj
+  copy ..\tiff\$D\tif_strip.obj
+  copy ..\tiff\$D\tif_swab.obj
+  copy ..\tiff\$D\tif_thunder.obj
+  copy ..\tiff\$D\tif_tile.obj
+  copy ..\tiff\$D\tif_version.obj
+  copy ..\tiff\$D\tif_warning.obj
+  copy ..\tiff\$D\tif_write.obj
   copy ..\tiff\$D\tif_zip.obj