cleaning up the mess created by the FloodFill patch

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

diff --git a/distrib/msw/tmake/x11.t b/distrib/msw/tmake/x11.t
index 4036206ddc94846706c07be296058cfd8ac7cadc..f4934126853b4ca05528a53221dd93daa0433dc6 100644 (file)
--- a/distrib/msw/tmake/x11.t
+++ b/distrib/msw/tmake/x11.t
@@ -15,6 +15,13 @@
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
 
     #! 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} =~ /\bNotX11\b/;
 
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\bNotX11\b/;
 


@@ -33,13 +40,6 @@
         $project{"COMMONOBJS"} .= $fileobj . " ";
     }
 
         $project{"COMMONOBJS"} .= $fileobj . " ";
     }
 

-    foreach $file (sort keys %wxX11) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-
-        $project{"X11_SOURCES"} .= "x11/" . $file . " ";
-        $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
-    }
-

     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 


@@ -64,6 +64,10 @@
         $project{"X11_HEADERS"} .= "x11/" . $file . " "
     }
 
         $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 . " "
     }
     foreach $file (sort keys %wxGENERICINCLUDE) {
         $project{"X11_HEADERS"} .= "generic/" . $file . " "
     }


@@ -88,15 +92,15 @@ ALL_SOURCES = \
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 
 ALL_HEADERS = \
                #$ ExpandList("X11_HEADERS");
 

+GUI_LOWLEVEL_OBJS = \
+               #$ ExpandList("GUIOBJS");
+

 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
 GENERICOBJS = \
                #$ ExpandList("GENERICOBJS");
 
 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
 GENERICOBJS = \
                #$ ExpandList("GENERICOBJS");
 

-GUI_LOWLEVEL_OBJS = \
-               #$ ExpandList("GUI_LOWLEVEL_OBJS");
-

 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");
 
 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");