X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/54744d3ab7756a61fe2d6ef4e8da5bde9ff2cec2..a97d569cbbf90ba8bb293214055c3a8c19d447b5:/distrib/msw/tmake/msw.t

diff --git a/distrib/msw/tmake/msw.t b/distrib/msw/tmake/msw.t
index 48b489b93c..32681accc9 100644
--- a/distrib/msw/tmake/msw.t
+++ b/distrib/msw/tmake/msw.t
@@ -13,50 +13,47 @@
     IncludeTemplate("filelist.t");
 
     #! find all our sources
-    $project{"COMMONOBJS"} .= "parser.o ";
-    $project{"COMMONDEPS"} .= "parser.d ";
-
     foreach $file (sort keys %wxGeneric) {
         next if $wxGeneric{$file} =~ /\b(PS|G|U|16)\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MSW_SOURCES"} .= "generic/" . $file . " ";
         $project{"GENERICOBJS"} .= $fileobj . " ";
-        $project{"GENERICDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
+        next if $wxCommon{$file} =~ /\b(R|U|16)\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MSW_SOURCES"} .= "common/" . $file . " ";
         $project{"COMMONOBJS"} .= $fileobj . " ";
-        $project{"COMMONDEPS"} .= $filedep . " "
     }
 
     foreach $file (sort keys %wxMSW) {
-        #! OLE files can'be compiled with mingw32 yet
-        next if $wxMSW{$file} =~ /\b(O|16)\b/;
+        next if $wxMSW{$file} =~ /\b16\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
-        $project{"MSW_SOURCES"} .= "msw/" . $file . " ";
-        $project{"GUIOBJS"} .= $fileobj . " ";
-        $project{"GUIDEPS"} .= $filedep . " "
+        if( $wxMSW{$file} =~ /\bO\b/ ) {
+            $project{"MSW_SOURCES"} .= "msw/ole/" . $file . " ";
+            $project{"OLEOBJS"} .= $fileobj . " ";
+        } else {
+            $project{"MSW_SOURCES"} .= "msw/" . $file . " ";
+            $project{"GUIOBJS"} .= $fileobj . " ";
+
+            if ( $wxMSW{$file} =~ /\bL\b/ ) {
+                $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+            }
+        }
     }
 
     foreach $file (sort keys %wxHTML) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
-        ($filedep = $file) =~ s/cp?p?$/\d/;
 
         $project{"MSW_SOURCES"} .= "html/" . $file . " ";
         $project{"HTMLOBJS"} .= $fileobj . " ";
-        $project{"HTMLDEPS"} .= $filedep . " "
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
@@ -67,6 +64,10 @@
         $project{"MSW_HEADERS"} .= "msw/" . $file . " "
     }
 
+    foreach $file (sort keys %wxOLEINCLUDE) {
+        $project{"MSW_HEADERS"} .= "msw/ole/" . $file . " ";
+    }
+
     foreach $file (sort keys %wxGENERICINCLUDE) {
         $project{"MSW_HEADERS"} .= "generic/" . $file . " "
     }
@@ -83,7 +84,7 @@
         $project{"MSW_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 MSW.T!
 ALL_SOURCES = \
 		#$ ExpandList("MSW_SOURCES");
@@ -94,35 +95,18 @@ ALL_HEADERS = \
 COMMONOBJS = \
 		#$ ExpandList("COMMONOBJS");
 
-COMMONDEPS = \
-		#$ ExpandList("COMMONDEPS");
-
 GENERICOBJS = \
 		#$ ExpandList("GENERICOBJS");
 
-GENERICDEPS = \
-		#$ ExpandList("GENERICDEPS");
-
 GUIOBJS = \
 		#$ ExpandList("GUIOBJS");
 
-GUIDEPS = \
-		#$ ExpandList("GUIDEPS");
-
-UNIXOBJS = \
-		#$ ExpandList("UNIXOBJS");
-
-UNIXDEPS = \
-		#$ ExpandList("UNIXDEPS");
+GUI_LOWLEVEL_OBJS = \
+		#$ ExpandList("GUI_LOWLEVEL_OBJS");
 
 HTMLOBJS = \
 		#$ ExpandList("HTMLOBJS");
 
-HTMLDEPS = \
-		#$ ExpandList("HTMLDEPS");
-
-IODBCOBJS = \
-		#$ ExpandList("IODBCOBJS");
+OLEOBJS = \
+		#$ ExpandList("OLEOBJS");
 
-IODBCDEPS = \
-		#$ ExpandList("IODBCDEPS");