From 99b02ec0d80c0f84a881c304fcbab9701a5a13cd Mon Sep 17 00:00:00 2001 From: George Tasker Date: Tue, 13 Mar 2001 22:06:59 +0000 Subject: [PATCH 1/1] Fixed the template so that the .DSP file that gets generated will actually compile (it was failing trying to build y_tab.c which does not exist until you do a command line build, and even after creating it, there were duplicate definitions). All tests I ran did not need this file to be compiled, so it is not currently built. The wxBase(d).lib files are no placed in the wxwindows/lib directory with all the other LIB files. The BaseDebug and BaseRelease directories (that hold all the OBJ/PCH/etc files) are now created under the src/msw directory so that if the wxBase(d).lib file is built with the IDE, and then an APP (like samples/console) is built with the command line makefiles, then all the PCH and DUMMY.OBJ files are in the expected place The previous version of this file was trying to use the $(WX) environment variable, which was not supported. It has been changed to use $(WXWIN) now like all other places in the program. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@9523 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/tmake/vc6base.t | 40 +++++++++++-------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/distrib/msw/tmake/vc6base.t b/distrib/msw/tmake/vc6base.t index c69fed6103..e759fb4e6f 100644 --- a/distrib/msw/tmake/vc6base.t +++ b/distrib/msw/tmake/vc6base.t @@ -65,16 +65,16 @@ RSC=rc.exe # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 0 -# PROP BASE Output_Dir "BaseRelease" -# PROP BASE Intermediate_Dir "BaseRelease" +# PROP BASE Output_Dir "lib" +# PROP BASE Intermediate_Dir "src/msw/BaseRelease" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 0 -# PROP Output_Dir "BaseRelease" -# PROP Intermediate_Dir "BaseRelease" +# PROP Output_Dir "lib" +# PROP Intermediate_Dir "src/msw/BaseRelease" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(wx)\include" /I "$(wx)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MD /W4 /Zi /O2 /I "$(WXWIN)\include" /I "$(WXWIN)\src\zlib" /D "NDEBUG" /D wxUSE_GUI=0 /D WIN95=1 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN32__" /D "_MT" /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -82,22 +82,22 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"lib\wxBase.lib" !ELSEIF "$(CFG)" == "wxBase - Win32 Debug" # PROP BASE Use_MFC 0 # PROP BASE Use_Debug_Libraries 1 -# PROP BASE Output_Dir "BaseDebug" -# PROP BASE Intermediate_Dir "BaseDebug" +# PROP BASE Output_Dir "lib" +# PROP BASE Intermediate_Dir "src/msw/BaseDebug" # PROP BASE Target_Dir "" # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 -# PROP Output_Dir "BaseDebug" -# PROP Intermediate_Dir "BaseDebug" +# PROP Output_Dir "lib" +# PROP Intermediate_Dir "src/msw/BaseDebug" # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MT" /YX /FD /c -# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(wx)\include" /I "$(wx)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W4 /Zi /Od /I "$(WXWIN)\include" /I "$(WXWIN)\src\zlib" /D "_DEBUG" /D DEBUG=1 /D WXDEBUG=1 /D "__WXDEBUG__" /D wxUSE_GUI=0 /D "__WIN95__" /D "WIN32" /D "_WIN32" /D WINVER=0x400 /D "__WINDOWS__" /D "__WIN32__" /D "__WXMSW__" /D "_MT" /Fr /Yu"wx/wxprec.h" /FD /c # ADD BASE RSC /l 0x409 # ADD RSC /l 0x409 BSC32=bscmake.exe @@ -105,7 +105,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo /o"lib/wxBase.bsc" LIB32=link.exe -lib # ADD BASE LIB32 /nologo -# ADD LIB32 /nologo +# ADD LIB32 /nologo /out:"lib\wxBased.lib" !ENDIF @@ -125,21 +125,5 @@ SOURCE=.\src\msw\dummy.cpp #$ ExpandGlue("WXCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\common\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); #$ ExpandGlue("WXMSWCSRCS", "# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n# Begin Source File\n\nSOURCE=.\\src\\msw\\", "\n# SUBTRACT CPP /YX /Yc /Yu\n# End Source File\n"); -# Begin Source File - -SOURCE=.\src\common\y_tab.c - -!IF "$(CFG)" == "wxBase - Win32 Release" - -# SUBTRACT CPP /YX /Yc /Yu - -!ELSEIF "$(CFG)" == "wxBase - Win32 Debug" - -# ADD CPP /W1 -# SUBTRACT CPP /YX /Yc /Yu - -!ENDIF - -# End Source File # End Target # End Project -- 2.45.2