Adding MSVC makefile support for building the TIFF library

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/vc.t b/distrib/msw/tmake/vc.t
index 3c119d48485051f2f8c4551d04d49adc92d13c6f..7f162c810db46039ecd377c2e1900450fe047c34 100644 (file)
--- a/distrib/msw/tmake/vc.t
+++ b/distrib/msw/tmake/vc.t
@@ -155,7 +155,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
 
 # Normal, static library

-all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
+all:    dirs $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg tiff $(LIBTARGET)

 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 
 
 dirs: $(MSWDIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(OLEDIR)\$D $(HTMLDIR)\$D
 


@@ -241,7 +241,7 @@ $(WXDIR)\lib\$(WXLIBNAME).dll: $(DUMMYOBJ) $(OBJECTS)
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll
     $(link) @<<
     $(LINKFLAGS)
     -out:$(WXDIR)\lib\$(WXLIBNAME).dll

-    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib
+    $(DUMMYOBJ) $(OBJECTS) $(guilibsdll) shell32.lib comctl32.lib ctl3d32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib odbc32.lib advapi32.lib winmm.lib $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib $(WXDIR)\lib\jpeg.lib $(WXDIR)\lib\tiff.lib

 <<
 
 !endif
 <<
 
 !endif


@@ -318,6 +318,16 @@ clean_jpeg:
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.vc clean
     cd $(WXDIR)\src\msw
 

+tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)  CRTFLAG=$(CRTFLAG) all
+    cd $(WXDIR)\src\msw
+
+clean_tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.vc clean
+    cd $(WXDIR)\src\msw
+

 xpm:
     cd $(WXDIR)\src\xpm
     nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
 xpm:
     cd $(WXDIR)\src\xpm
     nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)


@@ -333,7 +343,7 @@ rcparser:
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 
     nmake -f makefile.vc FINAL=$(FINAL)
     cd $(WXDIR)\src\msw
 

-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg 
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_xpm clean_jpeg clean_tiff

         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
         -erase $(LIBTARGET)
         -erase $(WXDIR)\lib\$(WXLIBNAME).pdb
         -erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll

diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h
index 561b2e44155595ffad0fa7cf5dbc7b69427fa874..52fc43a9ec337aecb362b1bfee9186ddba3ef6a5 100644 (file)
--- a/include/wx/msw/setup0.h
+++ b/include/wx/msw/setup0.h
@@ -214,7 +214,7 @@
                                 // if alignment is an issue.
 #define wxUSE_DEBUG_CONTEXT       1
                                 // If 1, enables wxDebugContext, for
                                 // if alignment is an issue.
 #define wxUSE_DEBUG_CONTEXT       1
                                 // If 1, enables wxDebugContext, for

-                                // writing error messages to file, etc. 
+                                // writing error messages to file, etc.

                                 // If __WXDEBUG__ is not defined, will still use
                                 // normal memory operators.
                                 // It's recommended to set this to 1,
                                 // If __WXDEBUG__ is not defined, will still use
                                 // normal memory operators.
                                 // It's recommended to set this to 1,


@@ -243,7 +243,7 @@
                                 // Some databases/ODBC drivers only allow forward scrolling cursors.
                                 // Unless you specifically want to use backward scrolling
                                 // cursors, and you know that all of the databases/ODBC drivers
                                 // Some databases/ODBC drivers only allow forward scrolling cursors.
                                 // Unless you specifically want to use backward scrolling
                                 // cursors, and you know that all of the databases/ODBC drivers

-                                // that you will use these odbc classes with allow backward 
+                                // that you will use these odbc classes with allow backward

                                 // scrolling cursors, this setting should remain set to 1
                                 // for maximum database/driver compatibilty
 
                                 // scrolling cursors, this setting should remain set to 1
                                 // for maximum database/driver compatibilty
 


@@ -277,6 +277,8 @@
                                 // Use PNG bitmap/image code
 #define wxUSE_LIBJPEG       1
                                 // Use JPEG bitmap/image code
                                 // Use PNG bitmap/image code
 #define wxUSE_LIBJPEG       1
                                 // Use JPEG bitmap/image code

+#define wxUSE_LIBTIFF       0
+                                // Use TIFF bitmap/image code

 #define wxUSE_GIF           1
                                 // Use GIF bitmap/image code
 #define wxUSE_PNM           1
 #define wxUSE_GIF           1
                                 // Use GIF bitmap/image code
 #define wxUSE_PNM           1

diff --git a/src/tiff/makefile.vc b/src/tiff/makefile.vc
new file mode 100644 (file)
index 0000000..12dbe1e
--- /dev/null
+++ b/src/tiff/makefile.vc
@@ -0,0 +1,45 @@
+
+
+LIBTARGET=$(WXDIR)\lib\tiff.lib
+
+OBJECTS= \
+               tif_aux.obj \
+               tif_close.obj \
+               tif_codec.obj \
+               tif_compress.obj \
+               tif_dir.obj \
+               tif_dirinfo.obj \
+               tif_dirread.obj \
+               tif_dirwrite.obj \
+               tif_dumpmode.obj \
+               tif_error.obj \
+               tif_fax3.obj \
+               tif_fax3sm.obj \
+               tif_flush.obj \
+               tif_getimage.obj \
+               tif_jpeg.obj \
+               tif_luv.obj \
+               tif_lzw.obj \
+               tif_next.obj \
+               tif_open.obj \
+               tif_packbits.obj \
+               tif_pixarlog.obj \
+               tif_predict.obj \
+               tif_print.obj \
+               tif_read.obj \
+               tif_strip.obj \
+               tif_swab.obj \
+               tif_thunder.obj \
+               tif_tile.obj \
+               tif_version.obj \
+               tif_warning.obj \
+               tif_win32.obj \
+               tif_write.obj \
+               tif_zip.obj \
+
+
+
+# Pull in standard variable definitions
+
+!include ..\makelib.vc
+