From: Julian Smart Date: Mon, 11 Jun 2001 07:49:38 +0000 (+0000) Subject: Project file updates; cast in strconv.cpp to compile with VC++ 6 X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/264b3fc80fe33d1a239ad8e904ee9b318055e70d Project file updates; cast in strconv.cpp to compile with VC++ 6 git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10526 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/contrib/samples/xrc/XrcDemoVC.dsp b/contrib/samples/xrc/XrcDemoVC.dsp index 57483e48f0..c82fa12866 100644 --- a/contrib/samples/xrc/XrcDemoVC.dsp +++ b/contrib/samples/xrc/XrcDemoVC.dsp @@ -9,19 +9,19 @@ CFG=XrcDemoVC - Win32 Debug !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "XrcDemoVC.mak". -!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 "XrcDemoVC.mak" CFG="XrcDemoVC - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "XrcDemoVC - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "XrcDemoVC - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "XrcDemoVC - Win32 Debug DLL" (based on "Win32 (x86) Application") !MESSAGE "XrcDemoVC - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -72,7 +72,8 @@ 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # 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" @@ -147,7 +148,7 @@ LINK32=link.exe # Name "XrcDemoVC - Win32 Release DLL" # Begin Source File -SOURCE=.\xmldemo.cpp +SOURCE=.\xrcdemo.cpp !IF "$(CFG)" == "XrcDemoVC - Win32 Release" @@ -157,7 +158,6 @@ SOURCE=.\xmldemo.cpp !ELSEIF "$(CFG)" == "XrcDemoVC - Win32 Debug DLL" -# SUBTRACT BASE CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu !ELSEIF "$(CFG)" == "XrcDemoVC - Win32 Release DLL" @@ -167,9 +167,7 @@ SOURCE=.\xmldemo.cpp # End Source File # Begin Source File -SOURCE=.\xmldemo.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include" +SOURCE=.\xrcdemo.rc # End Source File # End Target # End Project diff --git a/contrib/utils/wxrc/wxRcVC.dsp b/contrib/utils/wxrc/wxRcVC.dsp new file mode 100644 index 0000000000..7457d741d5 --- /dev/null +++ b/contrib/utils/wxrc/wxRcVC.dsp @@ -0,0 +1,161 @@ +# Microsoft Developer Studio Project File - Name="wxRcVC" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=wxRcVC - 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 NMAKE /f "wxRcVC.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 NMAKE /f "wxRcVC.mak" CFG="wxRcVC - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "wxRcVC - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "wxRcVC - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "wxRcVC - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "wxRcVC - Win32 Release DLL" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "wxRcVC - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# 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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxconvert.exe" + +!ELSEIF "$(CFG)" == "wxRcVC - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# 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" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxconvert.exe" /pdbtype:sept + +!ELSEIF "$(CFG)" == "wxRcVC - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "DebugDLL" +# PROP BASE Intermediate_Dir "DebugDLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDLL" +# PROP Intermediate_Dir "DebugDLL" +# 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" /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 /FD /c +# SUBTRACT CPP /YX +# 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" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxdlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept + +!ELSEIF "$(CFG)" == "wxRcVC - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ReleaseDLL" +# PROP BASE Intermediate_Dir "ReleaseDLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDLL" +# PROP Intermediate_Dir "ReleaseDLL" +# 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" /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 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxdll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" + +!ENDIF + +# Begin Target + +# Name "wxRcVC - Win32 Release" +# Name "wxRcVC - Win32 Debug" +# Name "wxRcVC - Win32 Debug DLL" +# Name "wxRcVC - Win32 Release DLL" +# Begin Source File + +SOURCE=.\wxrc.cpp +# End Source File +# Begin Source File + +SOURCE=.\wxrc.rc +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +# End Source File +# End Target +# End Project diff --git a/contrib/utils/wxrc/wxRcVC.dsw b/contrib/utils/wxrc/wxRcVC.dsw new file mode 100644 index 0000000000..515e5baeca --- /dev/null +++ b/contrib/utils/wxrc/wxRcVC.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "wxRcVC"=.\wxRcVC.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/contrib/utils/wxrcedit/wxRcEditVC.dsp b/contrib/utils/wxrcedit/wxRcEditVC.dsp new file mode 100644 index 0000000000..32dffcfade --- /dev/null +++ b/contrib/utils/wxrcedit/wxRcEditVC.dsp @@ -0,0 +1,243 @@ +# Microsoft Developer Studio Project File - Name="wxRcEditVC" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=wxRcEditVC - 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 NMAKE /f "wxRcEditVC.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 NMAKE /f "wxRcEditVC.mak" CFG="wxRcEditVC - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "wxRcEditVC - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "wxRcEditVC - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "wxRcEditVC - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "wxRcEditVC - Win32 Release DLL" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "wxRcEditVC - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# 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 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxconvert.exe" + +!ELSEIF "$(CFG)" == "wxRcEditVC - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# 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 /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# 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" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxconvert.exe" /pdbtype:sept + +!ELSEIF "$(CFG)" == "wxRcEditVC - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "DebugDLL" +# PROP BASE Intermediate_Dir "DebugDLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDLL" +# PROP Intermediate_Dir "DebugDLL" +# 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 /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 /FD /c +# SUBTRACT CPP /YX +# 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" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxdlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept + +!ELSEIF "$(CFG)" == "wxRcEditVC - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ReleaseDLL" +# PROP BASE Intermediate_Dir "ReleaseDLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDLL" +# PROP Intermediate_Dir "ReleaseDLL" +# 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 /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 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxdll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" + +!ENDIF + +# Begin Target + +# Name "wxRcEditVC - Win32 Release" +# Name "wxRcEditVC - Win32 Debug" +# Name "wxRcEditVC - Win32 Debug DLL" +# Name "wxRcEditVC - Win32 Release DLL" +# Begin Source File + +SOURCE=.\edapp.cpp +# End Source File +# Begin Source File + +SOURCE=.\editor.cpp +# End Source File +# Begin Source File + +SOURCE=.\editor.h +# End Source File +# Begin Source File + +SOURCE=.\nodehnd.cpp +# End Source File +# Begin Source File + +SOURCE=.\nodehnd.h +# End Source File +# Begin Source File + +SOURCE=.\nodesdb.cpp +# End Source File +# Begin Source File + +SOURCE=.\nodesdb.h +# End Source File +# Begin Source File + +SOURCE=.\pe_adv.cpp +# End Source File +# Begin Source File + +SOURCE=.\pe_adv.h +# End Source File +# Begin Source File + +SOURCE=.\pe_basic.cpp +# End Source File +# Begin Source File + +SOURCE=.\pe_basic.h +# End Source File +# Begin Source File + +SOURCE=.\preview.cpp +# End Source File +# Begin Source File + +SOURCE=.\preview.h +# End Source File +# Begin Source File + +SOURCE=.\propedit.cpp +# End Source File +# Begin Source File + +SOURCE=.\propedit.h +# End Source File +# Begin Source File + +SOURCE=.\propframe.cpp +# End Source File +# Begin Source File + +SOURCE=.\propframe.h +# End Source File +# Begin Source File + +SOURCE=.\splittree.cpp +# End Source File +# Begin Source File + +SOURCE=.\splittree.h +# End Source File +# Begin Source File + +SOURCE=.\treedt.h +# End Source File +# Begin Source File + +SOURCE=.\wxrcedit.rc +# End Source File +# Begin Source File + +SOURCE=.\xmlhelpr.cpp +# End Source File +# Begin Source File + +SOURCE=.\xmlhelpr.h +# End Source File +# End Target +# End Project diff --git a/contrib/utils/wxrcedit/wxRcEditVC.dsw b/contrib/utils/wxrcedit/wxRcEditVC.dsw new file mode 100644 index 0000000000..4b8edf0519 --- /dev/null +++ b/contrib/utils/wxrcedit/wxRcEditVC.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "wxRcEditVC"=.\wxRcEditVC.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### + diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp index c7a911c011..b7b4c27d4a 100644 --- a/distrib/msw/makefile.rsp +++ b/distrib/msw/makefile.rsp @@ -111,9 +111,6 @@ contrib/samples/stc/Makefile.in contrib/samples/applet/Makefile.in contrib/utils/Makefile.in -contrib/utils/convertrc/Makefile.in -contrib/utils/wxrc/Makefile.in -contrib/utils/wxrcedit/Makefile.in descrip.mms lib/vms.opt diff --git a/distrib/msw/xml.rsp b/distrib/msw/xml.rsp index 1ec456e659..cdb2d3f53e 100644 --- a/distrib/msw/xml.rsp +++ b/distrib/msw/xml.rsp @@ -1,77 +1,79 @@ -contrib/docs/html/xml/*.htm -contrib/docs/html/xml/*.gif -contrib/docs/html/xml/*.png -contrib/docs/winhelp/xml.hlp -contrib/docs/winhelp/xml.cnt -contrib/docs/pdf/xml.pdf +contrib/docs/html/xrc/*.htm +contrib/docs/html/xrc/*.gif +contrib/docs/html/xrc/*.png +contrib/docs/winhelp/xrc.hlp +contrib/docs/winhelp/xrc.cnt +contrib/docs/pdf/xrc.pdf -contrib/docs/latex/xml/*.tex -contrib/docs/latex/xml/*.sty -contrib/docs/latex/xml/*.bib -contrib/docs/latex/xml/*.hpj -contrib/docs/latex/xml/*.ini -contrib/docs/latex/xml/*.txt -contrib/docs/latex/xml/*.cnt -contrib/docs/latex/xml/*.eps -contrib/docs/latex/xml/*.bmp -contrib/docs/latex/xml/*.gif -contrib/docs/latex/xml/*.wmf +contrib/docs/latex/xrc/*.tex +contrib/docs/latex/xrc/*.sty +contrib/docs/latex/xrc/*.bib +contrib/docs/latex/xrc/*.hpj +contrib/docs/latex/xrc/*.ini +contrib/docs/latex/xrc/*.txt +contrib/docs/latex/xrc/*.cnt +contrib/docs/latex/xrc/*.eps +contrib/docs/latex/xrc/*.bmp +contrib/docs/latex/xrc/*.gif +contrib/docs/latex/xrc/*.wmf -contrib/src/xml/*.cpp -contrib/src/xml/*.h -contrib/src/xml/*.rc -contrib/src/xml/*.def -contrib/src/xml/*.xbm -contrib/src/xml/*.xpm -contrib/src/xml/XmlVC.dsp -contrib/src/xml/XmlVC.dsw -contrib/src/xml/makefile.vc -contrib/src/xml/makefile.bcc -contrib/src/xml/makefile.b32 -contrib/src/xml/makefile.wat -contrib/src/xml/makefile.g95 -contrib/src/xml/makefile.unx -contrib/src/xml/makefile.dos -contrib/src/xml/makefile.vms -contrib/src/xml/Makefile.in -contrib/src/xml/*.txt -contrib/src/xml/*.ico -contrib/src/xml/*.bmp -contrib/src/xml/README +contrib/src/xrc/*.cpp +contrib/src/xrc/*.h +contrib/src/xrc/*.rc +contrib/src/xrc/*.def +contrib/src/xrc/*.xbm +contrib/src/xrc/*.xpm +contrib/src/xrc/XrcVC.dsp +contrib/src/xrc/XrcVC.dsw +contrib/src/xrc/makefile.vc +contrib/src/xrc/makefile.bcc +contrib/src/xrc/makefile.b32 +contrib/src/xrc/makefile.wat +contrib/src/xrc/makefile.g95 +contrib/src/xrc/makefile.unx +contrib/src/xrc/makefile.dos +contrib/src/xrc/makefile.vms +contrib/src/xrc/Makefile.in +contrib/src/xrc/*.txt +contrib/src/xrc/*.ico +contrib/src/xrc/*.bmp +contrib/src/xrc/README +contrib/src/xrc/FORMAT.txt +contrib/src/xrc/README.EXPAT -contrib/src/xml/expat/copying.txt -contrib/src/xml/expat/xmlparse/*.c -contrib/src/xml/expat/xmlparse/*.h -contrib/src/xml/expat/xmltok/*.c -contrib/src/xml/expat/xmltok/*.h +contrib/src/xrc/expat/copying.txt +contrib/src/xrc/expat/xmlparse/*.c +contrib/src/xrc/expat/xmlparse/*.h +contrib/src/xrc/expat/xmltok/*.c +contrib/src/xrc/expat/xmltok/*.h -contrib/include/wx/xml/*.h +contrib/include/wx/xrc/*.h -contrib/samples/xml/*.cpp -contrib/samples/xml/*.h -contrib/samples/xml/*.rc -contrib/samples/xml/*.def -contrib/samples/xml/*.xbm -contrib/samples/xml/makefile.vc -contrib/samples/xml/makefile.bcc -contrib/samples/xml/makefile.b32 -contrib/samples/xml/makefile.wat -contrib/samples/xml/makefile.g95 -contrib/samples/xml/makefile.unx -contrib/samples/xml/makefile.dos -contrib/samples/xml/makefile.vms -contrib/samples/xml/Makefile.in -contrib/samples/xml/*.txt -contrib/samples/xml/*.ico -contrib/samples/xml/*.bmp -contrib/samples/xml/*.xpm -contrib/samples/xml/XmlDemoVC.dsp -contrib/samples/xml/XmlDemoVC.dsw -contrib/samples/xml/rc/*.bmp -contrib/samples/xml/rc/*.gif -contrib/samples/xml/rc/*.ico -contrib/samples/xml/rc/.xpm -contrib/samples/xml/rc/.xrc +contrib/samples/xrc/*.cpp +contrib/samples/xrc/*.h +contrib/samples/xrc/*.rc +contrib/samples/xrc/*.def +contrib/samples/xrc/*.xbm +contrib/samples/xrc/makefile.vc +contrib/samples/xrc/makefile.bcc +contrib/samples/xrc/makefile.b32 +contrib/samples/xrc/makefile.wat +contrib/samples/xrc/makefile.g95 +contrib/samples/xrc/makefile.unx +contrib/samples/xrc/makefile.dos +contrib/samples/xrc/makefile.vms +contrib/samples/xrc/Makefile.in +contrib/samples/xrc/*.txt +contrib/samples/xrc/*.ico +contrib/samples/xrc/*.bmp +contrib/samples/xrc/*.xpm +contrib/samples/xrc/XrcDemoVC.dsp +contrib/samples/xrc/XrcDemoVC.dsw +contrib/samples/xrc/rc/*.bmp +contrib/samples/xrc/rc/*.gif +contrib/samples/xrc/rc/*.ico +contrib/samples/xrc/rc/.xpm +contrib/samples/xrc/rc/.xrc contrib/utils/convertrc/*.cpp contrib/utils/convertrc/*.h @@ -112,8 +114,8 @@ contrib/utils/wxrc/*.txt contrib/utils/wxrc/*.ico contrib/utils/wxrc/*.bmp contrib/utils/wxrc/*.xpm -contrib/utils/wxrc/wxrcVC.dsp -contrib/utils/wxrc/wxrcVC.dsw +contrib/utils/wxrc/wxRcVC.dsp +contrib/utils/wxrc/wxRcVC.dsw contrib/utils/wxrcedit/*.cpp contrib/utils/wxrcedit/*.h @@ -133,8 +135,8 @@ contrib/utils/wxrcedit/*.txt contrib/utils/wxrcedit/*.ico contrib/utils/wxrcedit/*.bmp contrib/utils/wxrcedit/*.xpm -contrib/utils/wxrcedit/wxrceditVC.dsp -contrib/utils/wxrcedit/wxrceditVC.dsw +contrib/utils/wxrcedit/wxRcEditVC.dsp +contrib/utils/wxrcedit/wxRcEditVC.dsw contrib/utils/wxrcedit/df/*.df distrib/msw/xml.rsp diff --git a/docs/changes.txt b/docs/changes.txt index 43672a8637..717eadda29 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -10,6 +10,7 @@ wxBase: - Fixed new charset detection code (langinfo.h not included in intl.cpp; langinfo.h not neccessary in strconv.cpp) - ODBC Informix fixes (submitted by Roger Gammans) +- Added wxDbGrid class for displaying ODBC tables - Added wxDir::Traverse All (GUI): diff --git a/samples/xrc/XrcDemoVC.dsp b/samples/xrc/XrcDemoVC.dsp index 57483e48f0..c82fa12866 100644 --- a/samples/xrc/XrcDemoVC.dsp +++ b/samples/xrc/XrcDemoVC.dsp @@ -9,19 +9,19 @@ CFG=XrcDemoVC - Win32 Debug !MESSAGE use the Export Makefile command and run !MESSAGE !MESSAGE NMAKE /f "XrcDemoVC.mak". -!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 "XrcDemoVC.mak" CFG="XrcDemoVC - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE !MESSAGE "XrcDemoVC - Win32 Release" (based on "Win32 (x86) Application") !MESSAGE "XrcDemoVC - Win32 Debug" (based on "Win32 (x86) Application") !MESSAGE "XrcDemoVC - Win32 Debug DLL" (based on "Win32 (x86) Application") !MESSAGE "XrcDemoVC - Win32 Release DLL" (based on "Win32 (x86) Application") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -72,7 +72,8 @@ 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /Yu"wx/wxprec.h" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "../../../include" /I "../../../contrib/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX /Yc /Yu # 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" @@ -147,7 +148,7 @@ LINK32=link.exe # Name "XrcDemoVC - Win32 Release DLL" # Begin Source File -SOURCE=.\xmldemo.cpp +SOURCE=.\xrcdemo.cpp !IF "$(CFG)" == "XrcDemoVC - Win32 Release" @@ -157,7 +158,6 @@ SOURCE=.\xmldemo.cpp !ELSEIF "$(CFG)" == "XrcDemoVC - Win32 Debug DLL" -# SUBTRACT BASE CPP /YX /Yc /Yu # SUBTRACT CPP /YX /Yc /Yu !ELSEIF "$(CFG)" == "XrcDemoVC - Win32 Release DLL" @@ -167,9 +167,7 @@ SOURCE=.\xmldemo.cpp # End Source File # Begin Source File -SOURCE=.\xmldemo.rc -# ADD BASE RSC /l 0x809 -# ADD RSC /l 0x809 /i "../../../include" /i "../../../contrib/include" +SOURCE=.\xrcdemo.rc # End Source File # End Target # End Project diff --git a/src/common/strconv.cpp b/src/common/strconv.cpp index c0c44bb58a..900b6814a5 100644 --- a/src/common/strconv.cpp +++ b/src/common/strconv.cpp @@ -357,7 +357,7 @@ size_t wxMBConvUTF8::WC2MB(char *buf, const wchar_t *psz, size_t n) const { wxUint32 cc; #ifdef WC_UTF16 - size_t pa = decode_utf16(psz,cc); + size_t pa = decode_utf16((wchar_t*) psz,cc); psz += (pa == (size_t)-1) ? 1 : pa; #else cc=(*psz++) & 0x7fffffff; diff --git a/src/wxvc.dsp b/src/wxvc.dsp index 94a009a11f..b363fd9224 100644 --- a/src/wxvc.dsp +++ b/src/wxvc.dsp @@ -133,6 +133,10 @@ SOURCE=.\common\db.cpp # End Source File # Begin Source File +SOURCE=.\common\dbgrid.cpp +# End Source File +# Begin Source File + SOURCE=.\common\dbtable.cpp # End Source File # Begin Source File diff --git a/src/wxvc_dll.dsp b/src/wxvc_dll.dsp index cfead83e22..7509f987df 100644 --- a/src/wxvc_dll.dsp +++ b/src/wxvc_dll.dsp @@ -140,6 +140,10 @@ SOURCE=.\common\db.cpp # End Source File # Begin Source File +SOURCE=.\common\dbgrid.cpp +# End Source File +# Begin Source File + SOURCE=.\common\dbtable.cpp # End Source File # Begin Source File diff --git a/utils/wxrc/wxRcVC.dsp b/utils/wxrc/wxRcVC.dsp new file mode 100644 index 0000000000..7457d741d5 --- /dev/null +++ b/utils/wxrc/wxRcVC.dsp @@ -0,0 +1,161 @@ +# Microsoft Developer Studio Project File - Name="wxRcVC" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=wxRcVC - 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 NMAKE /f "wxRcVC.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 NMAKE /f "wxRcVC.mak" CFG="wxRcVC - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "wxRcVC - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "wxRcVC - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE "wxRcVC - Win32 Debug DLL" (based on "Win32 (x86) Application") +!MESSAGE "wxRcVC - Win32 Release DLL" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "wxRcVC - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# 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" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX +# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wx.lib png.lib zlib.lib jpeg.lib tiff.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /nodefaultlib:"msvcrtd.lib" /out:"Release/wxconvert.exe" + +!ELSEIF "$(CFG)" == "wxRcVC - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# 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" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "__WINDOWS__" /D "__WXMSW__" /D DEBUG=1 /D "__WXDEBUG__" /D "__WIN95__" /D "__WIN32__" /D WINVER=0x0400 /D "STRICT" /FD /c +# SUBTRACT CPP /YX /Yc /Yu +# 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" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxd.lib pngd.lib zlibd.lib jpegd.lib tiffd.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /nodefaultlib:"msvcrt.lib" /out:"Debug/wxconvert.exe" /pdbtype:sept + +!ELSEIF "$(CFG)" == "wxRcVC - Win32 Debug DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "DebugDLL" +# PROP BASE Intermediate_Dir "DebugDLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "DebugDLL" +# PROP Intermediate_Dir "DebugDLL" +# 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" /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 /FD /c +# SUBTRACT CPP /YX +# 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" +# ADD RSC /l 0x809 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxdlld.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept + +!ELSEIF "$(CFG)" == "wxRcVC - Win32 Release DLL" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "ReleaseDLL" +# PROP BASE Intermediate_Dir "ReleaseDLL" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "ReleaseDLL" +# PROP Intermediate_Dir "ReleaseDLL" +# 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" /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 +# ADD BASE RSC /l 0x809 /d "NDEBUG" +# ADD RSC /l 0x809 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# 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 wxdll.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" + +!ENDIF + +# Begin Target + +# Name "wxRcVC - Win32 Release" +# Name "wxRcVC - Win32 Debug" +# Name "wxRcVC - Win32 Debug DLL" +# Name "wxRcVC - Win32 Release DLL" +# Begin Source File + +SOURCE=.\wxrc.cpp +# End Source File +# Begin Source File + +SOURCE=.\wxrc.rc +# ADD BASE RSC /l 0x809 +# ADD RSC /l 0x809 +# End Source File +# End Target +# End Project diff --git a/utils/wxrc/wxRcVC.dsw b/utils/wxrc/wxRcVC.dsw new file mode 100644 index 0000000000..515e5baeca --- /dev/null +++ b/utils/wxrc/wxRcVC.dsw @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +############################################################################### + +Project: "wxRcVC"=.\wxRcVC.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +############################################################################### +