fixed NotMSW flag handling in the common files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13315 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/tmake/vc6msw.t b/distrib/msw/tmake/vc6msw.t
index 37dde59591bbad61895560bb6998fc65d9227e0d..9a2403be6fb77f2518f7bfa6d00986563cd839e5 100644 (file)
--- a/distrib/msw/tmake/vc6msw.t
+++ b/distrib/msw/tmake/vc6msw.t
@@ -20,7 +20,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-       next if $wxCommon{$file} =~ /\b16\b/;
+       next if $wxCommon{$file} =~ /\b(16|U)\b/;
 
        my $tag = $file =~ /\.c$/ ? "WXCSRCS" : "WXCOMMONSRCS";
        $project{$tag} .= $file . " "
@@ -36,7 +36,7 @@
     }
 
     foreach $file (sort keys %wxHTML) {
-       next if $wxHTML{$file} =~ /\b16\b/;
+       next if $wxHTML{$file} =~ /\b(16|U)\b/;
        $project{"WXHTMLSRCS"} .= $file . " "
     }
 

diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index 87bdde9c82250835bf5d2f68539d357c11fbdcf9..26d2966709168e3521b6843166a7a8fe2d6c87bc 100644 (file)
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -252,10 +252,6 @@ SOURCE=.\common\appcmn.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\common\bmpbase.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=.\common\choiccmn.cpp
 # End Source File
 # Begin Source File