correction for Mac OS compilation

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

diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t
index c5feea8eeac6ea628e7ba728503d2d67facb6ebf..9fd210fc09238e3cc919f044fb569b323d9e16f1 100644 (file)
--- a/distrib/msw/tmake/gtk.t
+++ b/distrib/msw/tmake/gtk.t
@@ -44,7 +44,12 @@
 
         $project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
         $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
+        $project{"GUIDEPS"} .= $filedep . " ";
+
+        if ( $wxGTK{$file} =~ /\bL\b/ ) {
+            $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+            $project{"GUI_LOWLEVEL_DEPS"} .= $filedep . " ";
+        }
     }
 
     foreach $file (sort keys %wxUNIX) {
@@ -64,18 +69,11 @@
         $project{"HTMLOBJS"} .= $fileobj . " ";
         $project{"HTMLDEPS"} .= $filedep . " "
     }
-    
-    foreach $file (sort keys %wxOGL) {
-        ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
-        $project{"GTK_SOURCES"} .= "ogl/" . $file . " ";
-        $project{"OGLOBJS"} .= $fileobj . " ";
-        $project{"OGLDEPS"} .= $filedep . " "
-    }
-    
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
+        next if $wxWXINCLUDE{$file} =~ /\bR\b/;
+
         $project{"GTK_HEADERS"} .= $file . " "
     }
 
@@ -95,10 +93,6 @@
         $project{"GTK_HEADERS"} .= "html/" . $file . " "
     }
 
-    foreach $file (sort keys %wxOGLINCLUDE) {
-        $project{"GTK_HEADERS"} .= "ogl/" . $file . " "
-    }
-
     foreach $file (sort keys %wxPROTOCOLINCLUDE) {
         $project{"GTK_HEADERS"} .= "protocol/" . $file . " "
     }
@@ -129,6 +123,12 @@ GUIOBJS = \
 GUIDEPS = \
                #$ ExpandList("GUIDEPS");
 
+GUI_LOWLEVEL_OBJS = \
+               #$ ExpandList("GUI_LOWLEVEL_OBJS");
+
+GUI_LOWLEVEL_DEPS = \
+               #$ ExpandList("GUI_LOWLEVEL_DEPS");
+
 UNIXOBJS = \
                #$ ExpandList("UNIXOBJS");
 
@@ -141,9 +141,3 @@ HTMLOBJS = \
 HTMLDEPS = \
                #$ ExpandList("HTMLDEPS");
 
-OGLOBJS = \
-               #$ ExpandList("OGLOBJS");
-
-OGLDEPS = \
-               #$ ExpandList("OGLDEPS");
-