don't lose fonts underlined flag in ReInit() (bug fix for the change in rev. 1.76)

[wxWidgets.git] / src / tiff / makefile.wat

diff --git a/src/tiff/makefile.wat b/src/tiff/makefile.wat
index 4f8d5cfc38db6d6af07b83c59f846f5e104eb776..f84784545aa85993dfbd005a410bcdeca828e8bd 100644 (file)
--- a/src/tiff/makefile.wat
+++ b/src/tiff/makefile.wat
@@ -3,6 +3,7 @@
 # File:                makefile.wat
 # Author:      Julian Smart
 # Created:     1998
 # File:                makefile.wat
 # Author:      Julian Smart
 # Created:     1998

+# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch

 #
 # Makefile : Builds TIFF library for Watcom C++, WIN32
 # This makefile has to rename files because apparently Watcom C++
 #
 # Makefile : Builds TIFF library for Watcom C++, WIN32
 # This makefile has to rename files because apparently Watcom C++


@@ -14,45 +15,63 @@ EXTRACPPFLAGS=-i=..\zlib
 
 !include $(WXDIR)\src\makewat.env
 
 
 !include $(WXDIR)\src\makewat.env
 

+# set RENAME to 1 to rename the files to the short names -- this is needed
+# with older Watcom versions
+# RENAME=1
+
+!ifeq RENAME 1
+TIFF=
+EXTRACPPFLAGS+=-dwxUSE_SHORTNAMES
+!else
+TIFF=tif_
+!endif
+

 WXLIB = $(WXDIR)\lib
 
 WXLIB = $(WXDIR)\lib
 

-LIBTARGET   = $(WXLIB)\tiff.lib
+LIBTARGET = $(WXLIB)\tiff$(WATCOM_SUFFIX).lib

 
 OBJECTS= &
 
 OBJECTS= &

-               _aux.obj &
-               close.obj &
-               codec.obj &
-               compress.obj &
-               dir.obj &
-               dirinfo.obj &
-               dirread.obj &
-               dirwrite.obj &
-               dumpmode.obj &
-               error.obj &
-               fax3.obj &
-               fax3sm.obj &
-               flush.obj &
-               getimage.obj &
-               jpeg.obj &
-               luv.obj &
-               lzw.obj &
-               next.obj &
-               open.obj &
-               packbits.obj &
-               pixarlog.obj &
-               predict.obj &
-               print.obj &
-               read.obj &
-               strip.obj &
-               swab.obj &
-               thunder.obj &
-               tile.obj &
-               version.obj &
-               warning.obj &
-               win32.obj &
-               write.obj &
-               zip.obj
+!ifeq RENAME 1
+               $(OUTPUTDIR)\_aux.obj &
+!else
+               $(OUTPUTDIR)\tif_aux.obj &
+!endif
+               $(OUTPUTDIR)\$(TIFF)close.obj &
+               $(OUTPUTDIR)\$(TIFF)codec.obj &
+               $(OUTPUTDIR)\$(TIFF)compress.obj &
+               $(OUTPUTDIR)\$(TIFF)dir.obj &
+               $(OUTPUTDIR)\$(TIFF)dirinfo.obj &
+               $(OUTPUTDIR)\$(TIFF)dirread.obj &
+               $(OUTPUTDIR)\$(TIFF)dirwrite.obj &
+               $(OUTPUTDIR)\$(TIFF)dumpmode.obj &
+               $(OUTPUTDIR)\$(TIFF)error.obj &
+               $(OUTPUTDIR)\$(TIFF)fax3.obj &
+               $(OUTPUTDIR)\$(TIFF)fax3sm.obj &
+               $(OUTPUTDIR)\$(TIFF)flush.obj &
+               $(OUTPUTDIR)\$(TIFF)getimage.obj &
+               $(OUTPUTDIR)\$(TIFF)jpeg.obj &
+               $(OUTPUTDIR)\$(TIFF)luv.obj &
+               $(OUTPUTDIR)\$(TIFF)lzw.obj &
+               $(OUTPUTDIR)\$(TIFF)next.obj &
+               $(OUTPUTDIR)\$(TIFF)open.obj &
+               $(OUTPUTDIR)\$(TIFF)packbits.obj &
+               $(OUTPUTDIR)\$(TIFF)pixarlog.obj &
+               $(OUTPUTDIR)\$(TIFF)predict.obj &
+               $(OUTPUTDIR)\$(TIFF)print.obj &
+               $(OUTPUTDIR)\$(TIFF)read.obj &
+               $(OUTPUTDIR)\$(TIFF)strip.obj &
+               $(OUTPUTDIR)\$(TIFF)swab.obj &
+               $(OUTPUTDIR)\$(TIFF)thunder.obj &
+               $(OUTPUTDIR)\$(TIFF)tile.obj &
+               $(OUTPUTDIR)\$(TIFF)version.obj &
+               $(OUTPUTDIR)\$(TIFF)warning.obj &
+               $(OUTPUTDIR)\$(TIFF)win32.obj &
+               $(OUTPUTDIR)\$(TIFF)write.obj &
+               $(OUTPUTDIR)\$(TIFF)zip.obj
+
+all: $(OUTPUTDIR) $(RENAME) $(LIBTARGET) .SYMBOLIC

 
 

+!ifeq RENAME 1

 rename: .SYMBOLIC
                copy tif_predict.h tif_pred.h
                copy tif_aux.c _aux.c 
 rename: .SYMBOLIC
                copy tif_predict.h tif_pred.h
                copy tif_aux.c _aux.c 


@@ -88,13 +107,16 @@ rename: .SYMBOLIC
                copy tif_win32.c win32.c 
                copy tif_write.c write.c 
                copy tif_zip.c zip.c
                copy tif_win32.c win32.c 
                copy tif_write.c write.c 
                copy tif_zip.c zip.c

+!endif

 
 

-all:        rename $(OBJECTS) $(LIBTARGET)
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@

 
 

+LBCFILE=$(OUTPUTDIR)\tiff.lbc

 $(LIBTARGET) : $(OBJECTS)
 $(LIBTARGET) : $(OBJECTS)

-    %create tmp.lbc
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+    %create $(LBCFILE)
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)

 
 clean:   .SYMBOLIC
     -erase *.obj
 
 clean:   .SYMBOLIC
     -erase *.obj


@@ -102,6 +124,7 @@ clean:   .SYMBOLIC
     -erase *.pch
     -erase *.err
     -erase *.lbc
     -erase *.pch
     -erase *.err
     -erase *.lbc

+!ifeq RENAME 1

        -erase tif_pred.h
        -erase _aux.c 
        -erase close.c 
        -erase tif_pred.h
        -erase _aux.c 
        -erase close.c 


@@ -136,6 +159,7 @@ clean:   .SYMBOLIC
        -erase win32.c 
        -erase write.c 
        -erase zip.c
        -erase win32.c 
        -erase write.c 
        -erase zip.c

+!endif

 
 cleanall:   clean
 
 
 cleanall:   clean