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
This commit is contained in:
@@ -155,7 +155,7 @@ HTMLOBJS = #$ ExpandList("WXHTMLOBJS");
|
|||||||
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)
|
||||||
|
|
||||||
# Normal, static library
|
# 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) @<<
|
$(link) @<<
|
||||||
$(LINKFLAGS)
|
$(LINKFLAGS)
|
||||||
-out:$(WXDIR)\lib\$(WXLIBNAME).dll
|
-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
|
nmake -f makefile.vc clean
|
||||||
cd $(WXDIR)\src\msw
|
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:
|
xpm:
|
||||||
cd $(WXDIR)\src\xpm
|
cd $(WXDIR)\src\xpm
|
||||||
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
nmake -f makefile.vc FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL) CRTFLAG=$(CRTFLAG)
|
||||||
@@ -333,7 +343,7 @@ rcparser:
|
|||||||
nmake -f makefile.vc FINAL=$(FINAL)
|
nmake -f makefile.vc FINAL=$(FINAL)
|
||||||
cd $(WXDIR)\src\msw
|
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 $(LIBTARGET)
|
||||||
-erase $(WXDIR)\lib\$(WXLIBNAME).pdb
|
-erase $(WXDIR)\lib\$(WXLIBNAME).pdb
|
||||||
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
-erase ..\..\lib\wx$(WXVERSION)$(LIBEXT).dll
|
||||||
|
@@ -277,6 +277,8 @@
|
|||||||
// Use PNG bitmap/image code
|
// Use PNG bitmap/image code
|
||||||
#define wxUSE_LIBJPEG 1
|
#define wxUSE_LIBJPEG 1
|
||||||
// Use JPEG bitmap/image code
|
// Use JPEG bitmap/image code
|
||||||
|
#define wxUSE_LIBTIFF 0
|
||||||
|
// Use TIFF bitmap/image code
|
||||||
#define wxUSE_GIF 1
|
#define wxUSE_GIF 1
|
||||||
// Use GIF bitmap/image code
|
// Use GIF bitmap/image code
|
||||||
#define wxUSE_PNM 1
|
#define wxUSE_PNM 1
|
||||||
|
45
src/tiff/makefile.vc
Normal file
45
src/tiff/makefile.vc
Normal file
@@ -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
|
||||||
|
|
Reference in New Issue
Block a user