fixes to ShowFullScreen (KDE 3.1)

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

diff --git a/distrib/msw/tmake/vc6univ.t b/distrib/msw/tmake/vc6univ.t
index 9a69fd5c2b5e90d38826c6c730f402dcaeea966c..44b3b0ed656b58564d17fdd872e0bb738751dd6f 100644 (file)
--- a/distrib/msw/tmake/vc6univ.t
+++ b/distrib/msw/tmake/vc6univ.t
@@ -25,12 +25,14 @@
        #! automatically low level
        next unless $wxMSW{$file} =~ /\b(L|B)\b/;
 
        #! automatically low level
        next unless $wxMSW{$file} =~ /\b(L|B)\b/;
 

-       my $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS";
+       my $tag;
+       if ( $wxMSW{$file} =~ /\bO\b/ ) { $tag = "WXOLESRCS" }
+       else { $tag = $file =~ /\.c$/ ? "WXMSWCSRCS" : "WXMSWSRCS" }

        $project{$tag} .= $file . " "
     }
 
     foreach $file (sort keys %wxUNIV) {
        $project{$tag} .= $file . " "
     }
 
     foreach $file (sort keys %wxUNIV) {

-       my $tag = $wxUNIV{$file} =~ /Theme/ ? "WXUNIVTHEMES" : "WXUNIVSRCS";
+       my $tag = $wxUNIV{$file} =~ /T/ ? "WXUNIVTHEMES" : "WXUNIVSRCS";

        $project{$tag} .= $file . " "
     }
 
        $project{$tag} .= $file . " "
     }
 


@@ -100,8 +102,8 @@ CFG=wxUniv - Win32 Debug
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0

-# PROP Scc_ProjName "wxUniv"
-# PROP Scc_LocalPath ".."
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""

 CPP=cl.exe
 RSC=rc.exe
 
 CPP=cl.exe
 RSC=rc.exe
 


@@ -183,6 +185,11 @@ SOURCE=.\msw\dummy.cpp
 # End Source File
 #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
 #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
 # End Source File
 #$ ExpandGlue("WXMSWSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# End Source File\n");
 #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");

+# Begin Group "OLE Files"
+
+# PROP Default_Filter ""
+#$ ExpandGlue("WXOLESRCS", "# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\msw\\ole\\", "\n# End Source File\n");
+# End Group

 # End Group
 # Begin Group "Universal Files"
 
 # End Group
 # Begin Group "Universal Files"
 


@@ -204,19 +211,19 @@ SOURCE=.\msw\dummy.cpp
 
 SOURCE=..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "wxUniv - Win32 Release"
 
 SOURCE=..\include\wx\univ\setup.h
 !IF  "$(CFG)" == "wxUniv - Win32 Release"

-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+# Begin Custom Build - Creating lib\univ\wx\setup.h from $(InputPath)

 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univ/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\univ\wx\setup.h
+       copy "$(InputPath)" ..\lib\univ\wx\setup.h

 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
 
 # End Custom Build
 !ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"

-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+# Begin Custom Build - Creating lib\univd\wx\setup.h from $(InputPath)

 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
 InputPath=..\include\wx\univ\setup.h
 
 "../lib/univd/wx/setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

-       copy $(InputPath) ..\lib\univd\wx\setup.h
+       copy "$(InputPath)" ..\lib\univd\wx\setup.h

 
 # End Custom Build
 !ENDIF 
 
 # End Custom Build
 !ENDIF