Various tweaks, fixes, and additions

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

diff --git a/distrib/msw/tmake/msw.t b/distrib/msw/tmake/msw.t
index 48b489b93cfb1bd832f093e9005cf0d747a15b56..42e56ef40c2115471813f881dc51f37f3804723c 100644 (file)
--- a/distrib/msw/tmake/msw.t
+++ b/distrib/msw/tmake/msw.t
@@ -39,15 +39,20 @@
     }
 
     foreach $file (sort keys %wxMSW) {
     }
 
     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/;
 
 
         ($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 . " ";
+            $project{"OLEDEPS"} .= $filedep . " ";
+        } else {
+            $project{"MSW_SOURCES"} .= "msw/" . $file . " ";
+            $project{"GUIOBJS"} .= $fileobj . " ";
+            $project{"GUIDEPS"} .= $filedep . " ";
+        }

     }
 
     foreach $file (sort keys %wxHTML) {
     }
 
     foreach $file (sort keys %wxHTML) {


@@ -121,6 +126,12 @@ HTMLOBJS = \
 HTMLDEPS = \
                #$ ExpandList("HTMLDEPS");
 
 HTMLDEPS = \
                #$ ExpandList("HTMLDEPS");
 

+OLEOBJS = \
+               #$ ExpandList("OLEOBJS");
+
+OLEDEPS = \
+               #$ ExpandList("OLEDEPS");
+

 IODBCOBJS = \
                #$ ExpandList("IODBCOBJS");
 
 IODBCOBJS = \
                #$ ExpandList("IODBCOBJS");