backported fix for proper tree ctrl refershing after changing item colour/font from 2.2

[wxWidgets.git] / distrib / msw / tmake / wat.t

diff --git a/distrib/msw/tmake/wat.t b/distrib/msw/tmake/wat.t
index bd4895007ca26a8ee1766b46b46f0fe99fb8aebb..50472bb67120ad8ba9390ffe2d84aae0d5e61397 100644 (file)
--- a/distrib/msw/tmake/wat.t
+++ b/distrib/msw/tmake/wat.t
@@ -28,6 +28,13 @@
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " "
     }
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " "
     }

+    
+    foreach $file (sort keys %wxHTML) {
+        next if $wxHTML{$file} =~ /\b16\b/;
+
+        $file =~ s/cp?p?$/obj/;
+        $project{"WXHTMLOBJS"} .= $file . " "
+    }

 
     foreach $file (sort keys %wxCommon) {
         $isCFile = $file =~ /\.c$/;
 
     foreach $file (sort keys %wxCommon) {
         $isCFile = $file =~ /\.c$/;


@@ -90,6 +97,7 @@ JPEGDIR=$(WXDIR)\src\jpeg
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole
 TIFFDIR=$(WXDIR)\src\tiff
 MSWDIR=$(WXDIR)\src\msw
 OLEDIR=$(MSWDIR)\ole

+HTMLDIR=$(WXDIR)\src\html

 
 DOCDIR = $(WXDIR)\docs
 
 
 DOCDIR = $(WXDIR)\docs
 


@@ -105,10 +113,12 @@ COMMONOBJS = &
 
 MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
 
 
 MSWOBJS = #$ ExpandGlue("WXMSWOBJS", "", " &\n\t")
 

+HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")
+

 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.

-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MSWOBJS) $(HTMLOBJS)

 
 

-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS)
+all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC

 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc
 
 $(LIBTARGET) : $(OBJECTS)
     %create tmp.lbc


@@ -206,6 +216,23 @@ $(COMMDIR)\lex_yy.c:    $(COMMDIR)\doslex.c
     }
 #$}
 
     }
 #$}
 

+
+########################################################
+# HTML objects (always compiled)
+
+#${
+    $_ = $project{"WXHTMLOBJS"};
+    my @objs = split;
+    foreach (@objs) {
+        $text .= $_;
+        s/\.obj$//;
+        $text .= ':     $(HTMLDIR)\\';
+        $text .= $_ . ".cpp\n" .
+                 '  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<' . "\n\n";
+    }
+#$}
+
+

 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
   trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \
 OBJ1 = adler32$(O) compress$(O) crc32$(O) gzio$(O) uncompr$(O) deflate$(O) \
   trees$(O)
 OBJ2 = zutil$(O) inflate$(O) infblock$(O) inftrees$(O) infcodes$(O) \