corrected several errors when generating project file with all configs

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

diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t
index 0e4bcfa2f4eacc0ff6f4d2eeec65e30fb546c8eb..fd4ebb39576900ca26bcc1766e68fa7e3183c9a2 100644 (file)
--- a/distrib/msw/tmake/x11.t
+++ b/distrib/msw/tmake/x11.t
@@ -13,10 +13,15 @@
     IncludeTemplate("filelist.t");
 
     #! find all our sources
-    $project{"COMMONOBJS"} .= "parser.o ";
+    foreach $file (sort keys %wxX11) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"X11_SOURCES"} .= "x11/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+    }
 
     foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bX\b/;
+        next if $wxGeneric{$file} =~ /\bNotX11\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -25,7 +30,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bX\b/;
+        next if $wxCommon{$file} =~ /\bNotX11\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -33,13 +38,6 @@
         $project{"COMMONOBJS"} .= $fileobj . " ";
     }
 
-    foreach $file (sort keys %wxX11) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-
-        $project{"X11_SOURCES"} .= "x11f/" . $file . " ";
-        $project{"GUIOBJS"} .= $fileobj . " ";
-    }
-
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -55,7 +53,7 @@
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
-        next if $wxWXINCLUDE{$file} =~ /\bX\b/;
+        next if $wxWXINCLUDE{$file} =~ /\bNotX11\b/;
 
         $project{"X11_HEADERS"} .= $file . " "
     }
@@ -64,6 +62,10 @@
         $project{"X11_HEADERS"} .= "x11/" . $file . " "
     }
 
+    foreach $file (sort keys %wxUNIVINCLUDE) {
+        $project{"X11_HEADERS"} .= "univ/" . $file . " ";
+    }
+
     foreach $file (sort keys %wxGENERICINCLUDE) {
         $project{"X11_HEADERS"} .= "generic/" . $file . " "
     }
@@ -81,22 +83,22 @@
     }
 #$}
 # This file was automatically generated by tmake 
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MOTIF.T!
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE X11.T!
 ALL_SOURCES = \
                #$ ExpandList("X11_SOURCES");
 
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 
+GUI_LOWLEVEL_OBJS = \
+               #$ ExpandList("GUIOBJS");
+
 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
 GENERICOBJS = \
                #$ ExpandList("GENERICOBJS");
 
-GUIOBJS = \
-               #$ ExpandList("GUIOBJS");
-
 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");