From 95ac740c3b6121d4490cde3341d0134ef8c267ba Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 30 May 2003 20:36:16 +0000 Subject: [PATCH] minor fixes to workspace/project files git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20771 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/HelpGen/src/HelpGen.rc | 2 - utils/HelpGen/src/HelpGenVC.dsp | 70 +++++++++++++++++---------------- utils/HelpGen/src/HelpGenVC.dsw | 15 +++++++ 3 files changed, 51 insertions(+), 36 deletions(-) delete mode 100644 utils/HelpGen/src/HelpGen.rc diff --git a/utils/HelpGen/src/HelpGen.rc b/utils/HelpGen/src/HelpGen.rc deleted file mode 100644 index 82bdf07561..0000000000 --- a/utils/HelpGen/src/HelpGen.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "wx/msw/wx.rc" - diff --git a/utils/HelpGen/src/HelpGenVC.dsp b/utils/HelpGen/src/HelpGenVC.dsp index 380db55677..294aa1078f 100644 --- a/utils/HelpGen/src/HelpGenVC.dsp +++ b/utils/HelpGen/src/HelpGenVC.dsp @@ -100,7 +100,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /I "../../../lib/basedlld" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /Yu"wx/wxprec.h" /FD /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x809 /d "_DEBUG" @@ -110,7 +110,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/helpgen.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxbase250d.lib /nologo /subsystem:windows /debug /machine:I386 /out:"DebugDLL/helpgen.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib" !ELSEIF "$(CFG)" == "HelpGenVC - Win32 Release DLL" @@ -126,7 +126,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/mswdll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c +# ADD CPP /nologo /MD /W3 /GX /O1 /Ob2 /I "../../../include" /I "../../../contrib/include" /I "../../../lib/basedll" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /D WXUSINGDLL=1 /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 @@ -137,7 +137,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib winmm.lib /nologo /subsystem:windows /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxmsw250.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/helpgen.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib" +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib comctl32.lib rpcrt4.lib wsock32.lib winmm.lib wxbase250.lib /nologo /subsystem:windows /machine:I386 /out:"ReleaseDLL/helpgen.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib" !ENDIF @@ -147,6 +147,9 @@ LINK32=link.exe # Name "HelpGenVC - Win32 Debug" # Name "HelpGenVC - Win32 Debug DLL" # Name "HelpGenVC - Win32 Release DLL" +# Begin Group "Sources" + +# PROP Default_Filter "" # Begin Source File SOURCE=.\cjparser.cpp @@ -166,10 +169,6 @@ SOURCE=.\cjparser.cpp # End Source File # Begin Source File -SOURCE=.\cjparser.h -# End Source File -# Begin Source File - SOURCE=.\docripper.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -187,10 +186,6 @@ SOURCE=.\docripper.cpp # End Source File # Begin Source File -SOURCE=.\docripper.h -# End Source File -# Begin Source File - SOURCE=.\HelpGen.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -208,12 +203,6 @@ SOURCE=.\HelpGen.cpp # End Source File # Begin Source File -SOURCE=.\HelpGen.rc -# ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /i "..\..\..\include" -# End Source File -# Begin Source File - SOURCE=.\ifcontext.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -231,10 +220,6 @@ SOURCE=.\ifcontext.cpp # End Source File # Begin Source File -SOURCE=.\ifcontext.h -# End Source File -# Begin Source File - SOURCE=.\markup.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -252,10 +237,6 @@ SOURCE=.\markup.cpp # End Source File # Begin Source File -SOURCE=.\markup.h -# End Source File -# Begin Source File - SOURCE=.\scriptbinder.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -273,10 +254,6 @@ SOURCE=.\scriptbinder.cpp # End Source File # Begin Source File -SOURCE=.\scriptbinder.h -# End Source File -# Begin Source File - SOURCE=.\sourcepainter.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -294,10 +271,6 @@ SOURCE=.\sourcepainter.cpp # End Source File # Begin Source File -SOURCE=.\sourcepainter.h -# End Source File -# Begin Source File - SOURCE=.\srcparser.cpp !IF "$(CFG)" == "HelpGenVC - Win32 Release" @@ -312,6 +285,34 @@ SOURCE=.\srcparser.cpp !ENDIF +# End Source File +# End Group +# Begin Group "Headers" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\cjparser.h +# End Source File +# Begin Source File + +SOURCE=.\docripper.h +# End Source File +# Begin Source File + +SOURCE=.\ifcontext.h +# End Source File +# Begin Source File + +SOURCE=.\markup.h +# End Source File +# Begin Source File + +SOURCE=.\scriptbinder.h +# End Source File +# Begin Source File + +SOURCE=.\sourcepainter.h # End Source File # Begin Source File @@ -329,5 +330,6 @@ SOURCE=.\wxstllst.h SOURCE=.\wxstlvec.h # End Source File +# End Group # End Target # End Project diff --git a/utils/HelpGen/src/HelpGenVC.dsw b/utils/HelpGen/src/HelpGenVC.dsw index 80d524ef13..fa565e37d5 100644 --- a/utils/HelpGen/src/HelpGenVC.dsw +++ b/utils/HelpGen/src/HelpGenVC.dsw @@ -9,6 +9,21 @@ Package=<5> {{{ }}} +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name wxBase + End Project Dependency +}}} + +############################################################################### + +Project: "wxBase"=..\..\..\src\wxBase.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + Package=<4> {{{ }}} -- 2.47.2