X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/457e6c54a28bc20cf347ba921755d7d5b296aa2a..b86e511a9bde666590061c8f74d5fed150442c83:/distrib/msw/tmake/wat.t diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t index 49c3c8957c..9e9f629805 100644 --- a/distrib/msw/tmake/wat.t +++ b/distrib/msw/tmake/wat.t @@ -30,9 +30,6 @@ } foreach $file (sort keys %wxCommon) { - #! doesn't compile, apparently - next if $file =~ /^imagjpeg\./; - $isCFile = $file =~ /\.c$/; $file =~ s/cp?p?$/obj/; $project{"WXCOMMONOBJS"} .= $file . " "; @@ -85,11 +82,13 @@ LIBTARGET = $(WXLIB)\wx.lib DUMMY=dummydll # ODBCLIB = ..\..\contrib\odbc\odbc32.lib -EXTRATARGETS = xpm png zlib -EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib +EXTRATARGETS = xpm png zlib jpeg tiff +EXTRATARGETSCLEAN = clean_xpm clean_png clean_zlib clean_jpeg clean_tiff GENDIR=$(WXDIR)\src\generic COMMDIR=$(WXDIR)\src\common XPMDIR=$(WXDIR)\src\xpm +JPEGDIR=$(WXDIR)\src\jpeg +TIFFDIR=$(WXDIR)\src\tiff MSWDIR=$(WXDIR)\src\msw OLEDIR=$(MSWDIR)\ole @@ -354,6 +353,26 @@ clean_zlib: .SYMBOLIC wmake -f makefile.wat clean cd $(WXDIR)\src\msw +jpeg: .SYMBOLIC + cd $(WXDIR)\src\jpeg + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_jpeg: .SYMBOLIC + cd $(WXDIR)\src\jpeg + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + +tiff: .SYMBOLIC + cd $(WXDIR)\src\tiff + wmake -f makefile.wat all + cd $(WXDIR)\src\msw + +clean_tiff: .SYMBOLIC + cd $(WXDIR)\src\tiff + wmake -f makefile.wat clean + cd $(WXDIR)\src\msw + MFTYPE=wat self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t cd $(WXDIR)\distrib\msw\tmake