cleaning up the mess created by the FloodFill patch

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

diff --git a/distrib/msw/tmake/vc6univ.t b/distrib/msw/tmake/vc6univ.t
index 54365d143be2ddb1fd2ed02a63d75721ed307d1c..bb8474878b5cfeb88be322dc1407ad233f2dd493 100644 (file)
--- a/distrib/msw/tmake/vc6univ.t
+++ b/distrib/msw/tmake/vc6univ.t
@@ -1,8 +1,8 @@
 #!#############################################################################
 #! File:    vc6univ.t
 #! Purpose: tmake template file from which the VC++ 6.0 project file for
 #!#############################################################################
 #! File:    vc6univ.t
 #! Purpose: tmake template file from which the VC++ 6.0 project file for

-#!          building static wxWindows library wxuniv.dsp is generated by running
-#!                  tmake -t vc6univ wxwin.pro -o wxuniv.dsp
+#!          building static wxWindows library wxUniv.dsp is generated by running
+#!                  tmake -t vc6univ wxwin.pro -o wxUniv.dsp

 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
 #! Version: $Id$
 #! Author:  Vadim Zeitlin
 #! Created: 29.09.01
 #! Version: $Id$


@@ -75,37 +75,37 @@
        $project{"WXHTMLHEADERS"} .= $file . " "
     }
 #$}
        $project{"WXHTMLHEADERS"} .= $file . " "
     }
 #$}

-# Microsoft Developer Studio Project File - Name="wxuniv" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="wxUniv" - Package Owner=<4>

 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 

-CFG=wxuniv - Win32 Debug
+CFG=wxUniv - Win32 Debug

 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 

-!MESSAGE NMAKE /f "wxuniv.mak".
+!MESSAGE NMAKE /f "wxUniv.mak".

 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 

-!MESSAGE NMAKE /f "wxuniv.mak" CFG="wxuniv - Win32 Debug"
+!MESSAGE NMAKE /f "wxUniv.mak" CFG="wxUniv - Win32 Debug"

 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 

-!MESSAGE "wxuniv - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "wxuniv - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxUniv - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "wxUniv - Win32 Debug" (based on "Win32 (x86) Static Library")

 !MESSAGE 
 
 # Begin Project
 # PROP AllowPerConfigDependencies 0
 !MESSAGE 
 
 # 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
 

-!IF  "$(CFG)" == "wxuniv - Win32 Release"
+!IF  "$(CFG)" == "wxUniv - Win32 Release"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0


@@ -128,7 +128,7 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
 
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo /out:"..\lib\wxuniv.lib"
 

-!ELSEIF  "$(CFG)" == "wxuniv - Win32 Debug"
+!ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"

 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
 
 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1


@@ -155,19 +155,13 @@ LIB32=link.exe -lib
 
 # Begin Target
 
 
 # Begin Target
 

-# Name "wxuniv - Win32 Release"
-# Name "wxuniv - Win32 Debug"
+# Name "wxUniv - Win32 Release"
+# Name "wxUniv - Win32 Debug"

 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
 #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");
 # Begin Group "Common Files"
 
 # PROP Default_Filter ""
 #$ ExpandGlue("WXCOMMONSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# End Source File\n");
 #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n");

-# Begin Source File
-
-SOURCE=.\common\y_tab.c
-# ADD CPP /W1 /D "USE_DEFINE"
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File

 # End Group
 # Begin Group "Generic Files"
 
 # End Group
 # Begin Group "Generic Files"
 


@@ -209,20 +203,20 @@ SOURCE=.\msw\dummy.cpp
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h
 # Begin Source File
 
 SOURCE=..\include\wx\univ\setup.h

-!IF  "$(CFG)" == "wxuniv - Win32 Release"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+!IF  "$(CFG)" == "wxUniv - Win32 Release"
+# 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
 
 # End Custom Build

-!ELSEIF  "$(CFG)" == "wxuniv - Win32 Debug"
-# Begin Custom Build - Creating wx/setup.h from $(InputPath)
+!ELSEIF  "$(CFG)" == "wxUniv - Win32 Debug"
+# 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