Script updates

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

diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t
index 0a1dd141dfe4be86e75dddbfd5581455b2715519..798d0355537baef187851c0377cf97d5879109fa 100644 (file)
--- a/distrib/msw/tmake/gtk.t
+++ b/distrib/msw/tmake/gtk.t
@@ -13,19 +13,27 @@
     IncludeTemplate("filelist.t");
 
     #! find all our sources
-    $project{"COMMONOBJS"} .= "parser.o ";
-
     foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bR\b/;
+        next if $wxGeneric{$file} =~ /\bNotGTK\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
         $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
-        $project{"GENERICOBJS"} .= $fileobj . " ";
+        $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/;
 
@@ -60,7 +68,7 @@
 
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
-        next if $wxWXINCLUDE{$file} =~ /\bR\b/;
+        next if $wxWXINCLUDE{$file} =~ /\bNotGTK\b/;
 
         $project{"GTK_HEADERS"} .= $file . " "
     }
@@ -70,6 +78,8 @@
     }
 
     foreach $file (sort keys %wxGENERICINCLUDE) {
+        next if $wxGENERICINCLUDE{$file} =~ /\bNotGTK\b/;
+
         $project{"GTK_HEADERS"} .= "generic/" . $file . " "
     }
 
@@ -85,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");
@@ -96,9 +106,6 @@ ALL_HEADERS = \
 COMMONOBJS = \
                #$ ExpandList("COMMONOBJS");
 
-GENERICOBJS = \
-               #$ ExpandList("GENERICOBJS");
-
 GUIOBJS = \
                #$ ExpandList("GUIOBJS");