X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d98fcc003d7e248a86cb62ad0fa2243604b2bd67..9e85f5ec6cd4fa03839f30084975c8c89eb5ad2f:/distrib/msw/tmake/wat.t?ds=sidebyside

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index b500044781..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 . " ";
@@ -43,7 +40,7 @@
         #! these files don't compile
         next if $file =~ /^pnghand\./;
 
-        next if $wxGeneric{$file} =~ /\b16\b/;
+#!        next if $wxGeneric{$file} =~ /\b16\b/;
 
         my $isOleObj = $wxMSW{$file} =~ /\bO\b/;
         my $isCFile = $file =~ /\.c$/;
@@ -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,8 +353,28 @@ 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
-makefile.$(MFTYPE) : $(WXWIN)\distrib\msw\tmake\filelist.txt $(WXWIN)\distrib\msw\tmake\$(MFTYPE).t
-	cd $(WXWIN)\distrib\msw\tmake
+self : .SYMBOLIC $(WXDIR)\distrib\msw\tmake\filelist.txt $(WXDIR)\distrib\msw\tmake\$(MFTYPE).t
+	cd $(WXDIR)\distrib\msw\tmake
 	tmake -t $(MFTYPE) wxwin.pro -o makefile.$(MFTYPE)
-	copy makefile.$(MFTYPE) $(WXWIN)\src\msw
+	copy makefile.$(MFTYPE) $(WXDIR)\src\msw