use unsigned char to avoid MSVC warnings about cast truncations

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

diff --git a/src/tiff/MAKEFILE.VA b/src/tiff/MAKEFILE.VA
index cd0d0bdcab146be6b3da7621eb748d46970a7b77..053d52532e0d81e7ead91d5e557697680807d898 100644 (file)
--- a/src/tiff/MAKEFILE.VA
+++ b/src/tiff/MAKEFILE.VA
@@ -4,6 +4,7 @@
 # Created:   2000
 # Updated:
 # Copyright: c) 2000, BHM
 # Created:   2000
 # Updated:
 # Copyright: c) 2000, BHM

+# Licence:   wxWindows Licence

 #
 # "%W% %G%"
 #
 #
 # "%W% %G%"
 #


@@ -18,6 +19,11 @@ OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB
 
 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)
 
 # Change WXDIR or WXWIN to wherever wxWindows is found
 WXDIR = $(WXWIN)
 


@@ -25,6 +31,12 @@ OS2TIFFDIR=$(WXDIR)\src\tiff
 OS2TIFFINC=$(WINTIFFDIR)
 OS2TIFFLIB=$(WXDIR)\lib\os2tiff.lib
 
 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
 INC=-I$(WXDIR)\src\TIFF -I$(OS2TIFFINC)
 
 !ifndef FINAL


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

+!if "$(WXMAKINGDLL)" == "1"
+D=DebugOS2DLL
+!else

 D=DebugOS2
 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


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

+!if "$(WXMAKINGDLL)" == "1"
+D=RelseOS2DLL
+!else

 D=RelseOS2
 D=RelseOS2

+!endif

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


@@ -61,7 +81,8 @@ CRTFLAG=/Gm /Gd
 !endif
 
 
 !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 $<
 
 {..\tiff}.c{..\tiff\$D}.obj:
     @echo $<


@@ -141,6 +162,8 @@ LIBOBJECTS = \
 
 all:  $(OBJECTS) $(OS2TIFFLIB)
 
 
 all:  $(OBJECTS) $(OS2TIFFLIB)
 

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

 $(WXDIR)\lib\os2tiff.lib: $(LIBOBJECTS)
  touch $(WXDIR)\lib\os2tiff.lib
  del $(WXDIR)\lib\os2tiff.lib
 $(WXDIR)\lib\os2tiff.lib: $(LIBOBJECTS)
  touch $(WXDIR)\lib\os2tiff.lib
  del $(WXDIR)\lib\os2tiff.lib


@@ -149,6 +172,20 @@ $(WXDIR)\lib\os2tiff.lib: $(LIBOBJECTS)
 <<
   del *.obj
 
 <<
   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
 clean:
         del      $(OS2TIFFLIB)
         erase /N $(OS2TIFFDIR)\$D