cleaning up the mess created by the FloodFill patch

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

diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t
index 5bdc9e97ca3235f98892dafea140f27766f8635b..6a1e34079c105533d0ce58f5d92470bf93c2110d 100644 (file)
--- a/distrib/msw/tmake/gtk.t
+++ b/distrib/msw/tmake/gtk.t
@@ -14,59 +14,64 @@
 
     #! find all our sources
     $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
 
     foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bR\b/;
+        next if $wxGeneric{$file} =~ /\bNotGTK\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
-        $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
+        $project{"GUIOBJS"} .= $fileobj . " ";
+
+        #! also add it to the list of object files used by wxUniv if there
+        #! is no file with the same name among wxUniv own objects
+        my $filereal = $file;
+        if ( $file =~ /^([^.]+)g.cpp$/ ) {
+            $filereal = "$1.cpp";
+        }
+        if ( !exists $wxUNIV{$filereal} ) {
+            $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+        }
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
+        next if $wxCommon{$file} =~ /\bNotGTK\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxGTK) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
         $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
+
+        if ( $wxGTK{$file} =~ /\bL\b/ ) {
+            $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+        }
     }
 
     foreach $file (sort keys %wxUNIX) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "unix/" . $file . " ";
         $project{"UNIXOBJS"} .= $fileobj . " ";
-        $project{"UNIXDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"GTK_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
-    
+
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
+        next if $wxWXINCLUDE{$file} =~ /\bNotGTK\b/;
+
         $project{"GTK_HEADERS"} .= $file . " "
     }
 
@@ -90,7 +95,7 @@
         $project{"GTK_HEADERS"} .= "protocol/" . $file . " "
     }
 #$}
-# 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 GTK.T!
 ALL_SOURCES = \
                #$ ExpandList("GTK_SOURCES");
@@ -101,30 +106,15 @@ ALL_HEADERS = \
 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-               #$ ExpandList("COMMONDEPS");
-
-GENERICOBJS = \
-               #$ ExpandList("GENERICOBJS");
-
-GENERICDEPS = \
-               #$ ExpandList("GENERICDEPS");
-
 GUIOBJS = \
                #$ ExpandList("GUIOBJS");
 
-GUIDEPS = \
-               #$ ExpandList("GUIDEPS");
+GUI_LOWLEVEL_OBJS = \
+               #$ ExpandList("GUI_LOWLEVEL_OBJS");
 
 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");
 
-UNIXDEPS = \
-               #$ ExpandList("UNIXDEPS");
-
 HTMLOBJS = \
                #$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-               #$ ExpandList("HTMLDEPS");
-