PCH and wxUSE_* fix.

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

diff --git a/distrib/msw/tmake/watmgl.t b/distrib/msw/tmake/watmgl.t
index a0a3db08beebd88a3c14a9c09be2d49984a6e043..416f8b16ce43844261d8067586d63bb479163f2f 100644 (file)
--- a/distrib/msw/tmake/watmgl.t
+++ b/distrib/msw/tmake/watmgl.t
@@ -53,7 +53,7 @@
 
     foreach $file (sort keys %wxUNIV) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
     foreach $file (sort keys %wxUNIV) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;

-       my $tag = $wxUNIV{$file} =~ /Theme/ ? "WXUNIVTHEMEOBJS" : "WXUNIVOBJS";
+       my $tag = $wxUNIV{$file} =~ /T/ ? "WXUNIVTHEMEOBJS" : "WXUNIVOBJS";

 
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " ";
 
         $file =~ s/cp?p?$/obj/;
         $project{$tag} .= $file . " ";


@@ -62,7 +62,7 @@
 #! an attempt to embed '#' directly in the string somehow didn't work...
 #$ $text = chr(35) . '!/binb/wmake.exe';
 
 #! an attempt to embed '#' directly in the string somehow didn't work...
 #$ $text = chr(35) . '!/binb/wmake.exe';
 

-# This file was automatically generated by tmake at #$ Now()
+# This file was automatically generated by tmake 

 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #


@@ -119,7 +119,16 @@ HTMLOBJS = #$ ExpandGlue("WXHTMLOBJS", "", " &\n\t")
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(MGLOBJS) $(UNIVOBJS) $(UNIVTHEMEOBJS) $(HTMLOBJS)
 

-all:        $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+SETUP_H=$(ARCHINCDIR)\wx\setup.h
+
+all:        $(SETUP_H) $(OBJECTS) $(LIBTARGET) $(EXTRATARGETS) .SYMBOLIC
+
+$(ARCHINCDIR)\wx:
+    mkdir $(ARCHINCDIR)
+    mkdir $(ARCHINCDIR)\wx
+
+$(SETUP_H): $(WXDIR)\include\wx\univ\setup.h $(ARCHINCDIR)\wx
+    copy $(WXDIR)\include\wx\univ\setup.h $@

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