X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3a922bb4bd8dbcb04e31e324648c2912e167e0cd..7516ed26c9749018135c24afdd0576e4366c92e6:/distrib/msw/tmake/gtk.t

diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t
index 0a1dd141df..7d7f7c9802 100644
--- a/distrib/msw/tmake/gtk.t
+++ b/distrib/msw/tmake/gtk.t
@@ -21,7 +21,17 @@
         ($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) {
@@ -96,9 +106,6 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-GENERICOBJS = \
-		#$ ExpandList("GENERICOBJS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");