diff --git a/contrib/src/fl/flVC.dsp b/contrib/src/fl/flVC.dsp
index ec5361b02b..89f23075d5 100644
--- a/contrib/src/fl/flVC.dsp
+++ b/contrib/src/fl/flVC.dsp
@@ -111,7 +111,7 @@ BSC32=bscmake.exe
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /machine:IX86
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw233d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw234d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "flVC - Win32 Release DLL"
@@ -144,9 +144,9 @@ BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw233d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw234d.lib /nologo /version:1.0 /dll /debug /machine:IX86 /out:"../../../lib/fldlld.dll" /libpath:"../../../lib"
# SUBTRACT BASE LINK32 /pdb:none
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw233.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib wxmsw234.lib /nologo /version:1.0 /dll /machine:IX86 /out:"../../../lib/fldll.dll" /libpath:"../../../lib"
# SUBTRACT LINK32 /pdb:none /incremental:no /debug
!ENDIF
diff --git a/contrib/utils/convertrc/ConvertVC.dsp b/contrib/utils/convertrc/ConvertVC.dsp
index 31de3d7b5e..97c2c7f155 100644
--- a/contrib/utils/convertrc/ConvertVC.dsp
+++ b/contrib/utils/convertrc/ConvertVC.dsp
@@ -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 wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept /libpath:"..\..\..\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 wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxconvert.exe" /pdbtype:sept /libpath:"..\..\..\lib"
!ELSEIF "$(CFG)" == "ConvertVC - Win32 Release DLL"
@@ -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 wxmsw233.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" /libpath:"..\..\..\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 wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxconvert.exe" /libpath:"..\..\..\lib"
!ENDIF
diff --git a/contrib/utils/wxrc/wxRcVC.dsp b/contrib/utils/wxrc/wxRcVC.dsp
index 24ae29e1e7..4d62151234 100644
--- a/contrib/utils/wxrc/wxRcVC.dsp
+++ b/contrib/utils/wxrc/wxRcVC.dsp
@@ -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 wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrc.exe" /pdbtype:sept /libpath:"..\..\..\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 wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrc.exe" /pdbtype:sept /libpath:"..\..\..\lib"
!ELSEIF "$(CFG)" == "wxRcVC - Win32 Release DLL"
@@ -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 wxmsw233.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrc.exe" /libpath:"..\..\..\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 wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrc.exe" /libpath:"..\..\..\lib"
!ENDIF
diff --git a/contrib/utils/wxrcedit/wxRcEditVC.dsp b/contrib/utils/wxrcedit/wxRcEditVC.dsp
index eddeaab732..406acc175a 100644
--- a/contrib/utils/wxrcedit/wxRcEditVC.dsp
+++ b/contrib/utils/wxrcedit/wxRcEditVC.dsp
@@ -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 wxmsw233d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrcedit.exe" /pdbtype:sept /libpath:"..\..\..\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 wxmsw234d.lib wxxrcd.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrcedit.exe" /pdbtype:sept /libpath:"..\..\..\lib"
!ELSEIF "$(CFG)" == "wxRcEditVC - Win32 Release DLL"
@@ -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 wxmsw233.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrcedit.exe" /libpath:"..\..\..\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 wxmsw234.lib wxxrc.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrcedit.exe" /libpath:"..\..\..\lib"
!ENDIF
diff --git a/distrib/msw/filerepl.bat b/distrib/msw/filerepl.bat
index 815fc0b19b..450a30b609 100755
--- a/distrib/msw/filerepl.bat
+++ b/distrib/msw/filerepl.bat
@@ -10,6 +10,7 @@ set files=%3
echo s/%keyword/%repl/g > script.tmp
call %wxwin\distrib\msw\expdwild.bat %3 list.tmp
+Rem goto end
set len=%@LINES[%files]
do i = 0 to %len by 1
diff --git a/distrib/msw/innobott.txt b/distrib/msw/innobott.txt
index 4fda9d8113..8a25fe1a4e 100644
--- a/distrib/msw/innobott.txt
+++ b/distrib/msw/innobott.txt
@@ -32,7 +32,7 @@
; DO NOT DELETE THEM or you may be unable to reload the script
;[ScriptSetup]
-;VerNum=2.3.3
+;VerNum=2.3.4
;InnoVer=1.3
;AddVerTo=AppVerName
;SetupFilename=setup.exe
diff --git a/distrib/msw/innotop.txt b/distrib/msw/innotop.txt
index 7e5c76ba20..a8f8486bf1 100644
--- a/distrib/msw/innotop.txt
+++ b/distrib/msw/innotop.txt
@@ -4,13 +4,13 @@
[Setup]
MinVersion=4.0,4.0
- AppName=wxWindows 2.3.3
+ AppName=wxWindows 2.3.4
AppId=wxWindows
CreateUninstallRegKey=1
UsePreviousAppDir=0
UsePreviousGroup=0
- AppVersion=2.3.3
- AppVerName=wxWindows 2.3.3
+ AppVersion=2.3.4
+ AppVerName=wxWindows 2.3.4
AppCopyright=Copyright © The wxWindows Team
BackColor=$FF0000
BackColor2=$000000
@@ -19,7 +19,7 @@
WindowStartMaximized=1
WindowVisible=1
WindowResizable=1
- UninstallDisplayName=wxWindows 2.3.3
+ UninstallDisplayName=wxWindows 2.3.4
UninstallLogMode=Append
DirExistsWarning=auto
UninstallFilesDir={app}
@@ -28,10 +28,10 @@
CreateAppDir=1
DisableProgramGroupPage=0
AlwaysCreateUninstallIcon=1
- UninstallIconName=Uninstall wxWindows 2.3.3
+ UninstallIconName=Uninstall wxWindows 2.3.4
Uninstallable=1
- DefaultDirName=c:\wxWindows_2.3.3
- DefaultGroupName=wxWindows 2.3.3
+ DefaultDirName=c:\wxWindows_2.3.4
+ DefaultGroupName=wxWindows 2.3.4
LicenseFile=C:\wx2dev\wxWindows\docs\licence.txt
InfoBeforeFile=C:\wx2dev\wxWindows\docs\readme.txt
InfoAfterFile=C:\wx2dev\wxWindows\docs\msw\install.txt
@@ -41,6 +41,6 @@
DiskClusterSize=512
ReserveBytes=0
UseSetupLdr=1
- SourceDir=c:\wx2dev\wxWindows\deliver\wxWindows-2.3.3
+ SourceDir=c:\wx2dev\wxWindows\deliver\wxWindows-2.3.4
OutputDir=c:\wx2dev\wxWindows\deliver
diff --git a/distrib/msw/zipdistinno.bat b/distrib/msw/zipdistinno.bat
index 41d5b8e024..80b83340c6 100755
--- a/distrib/msw/zipdistinno.bat
+++ b/distrib/msw/zipdistinno.bat
@@ -7,7 +7,7 @@ set webfiles=c:\wx2dev\wxWebSite
set inno=0
Rem Set this to the required version
-set version=2.3.3
+set version=2.3.4
if "%src" == "" goto usage
if "%dest" == "" goto usage
diff --git a/distrib/msw/zipmac.bat b/distrib/msw/zipmac.bat
index 2d18635834..a50770e1af 100755
--- a/distrib/msw/zipmac.bat
+++ b/distrib/msw/zipmac.bat
@@ -5,7 +5,7 @@ set src=%wxwin%
set dest=%src%\deliver
Rem Set this to the required version
-set version=2.3.1
+set version=2.3.4
if "%src%" == "" goto usage
if "%dest%" == "" goto usage
diff --git a/docs/gtk/install.txt b/docs/gtk/install.txt
index e57ebdf5d1..c7130233a9 100644
--- a/docs/gtk/install.txt
+++ b/docs/gtk/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWindows you are
using (including the beta) and what compiler on what system. One
- example: wxGTK 2.3.3, gcc 2.95.4, Redhat 6.2
+ example: wxGTK 2.3.4, gcc 2.95.4, Redhat 6.2
* The simplest case
-------------------
diff --git a/docs/mgl/install.txt b/docs/mgl/install.txt
index c3f4b23ebc..6da271dc36 100644
--- a/docs/mgl/install.txt
+++ b/docs/mgl/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWindows you are
using (including the beta) and what compiler on what system. One
- example: wxMGL 2.3.3, gcc 2.95.3, Redhat 7.0
+ example: wxMGL 2.3.4, gcc 2.95.3, Redhat 7.0
First steps
-----------
diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index c0c3157acb..6444041525 100644
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWindows you are
using (including the beta) and what compiler on what system. One
- example: wxMotif 2.3.3, gcc 2.95.4, Redhat 6.1
+ example: wxMotif 2.3.4, gcc 2.95.4, Redhat 6.1
First steps
-----------
diff --git a/docs/motif/readme.txt b/docs/motif/readme.txt
index d8f0554207..363c122331 100644
--- a/docs/motif/readme.txt
+++ b/docs/motif/readme.txt
@@ -1,7 +1,7 @@
- Welcome to wxWindows/Motif 2.3.3
+ Welcome to wxWindows/Motif 2.3.4
-You have downloaded version 2.3.3 of the Motif port of
+You have downloaded version 2.3.4 of the Motif port of
the wxWindows GUI library.
More information about the wxWindows project as a whole
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index b140c942b9..397d567e32 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -1,8 +1,8 @@
-Installing wxWindows 2.3.3
+Installing wxWindows 2.3.4
--------------------------
-This is wxWindows 2.3.3 for Microsoft Windows 9x/ME, Windows NT,
+This is wxWindows 2.3.4 for Microsoft Windows 9x/ME, Windows NT,
Windows 2000 and Windows XP. This is an unstable development release.
Please note that the library naming conventions for VC++
@@ -225,13 +225,13 @@ executables.
Borland C++ 4.5/5.0/5.5 compilation
-------------------------------
-Compiling using the makefiles (updated 24 Seot 02):
+Compiling using the makefiles (updated 24 Sept 02):
1. Make sure your WXWIN variable is set [e.g add
set WXWIN=c:\wxwindows
to your autoexec.bat file], The WXWIN variable should contain neither spaces nor -
You may like to use the short form as shown by a dos directory listing ;
- eg instead of c:\wxwindows-2.3.3 use c:\wxwind~1.3
+ eg instead of c:\wxwindows-2.3.4 use c:\wxwind~1.4
Reboot if needed for the changes to autoexec.bat to take effect.
2. Change directory to src\msw. Type 'make -f makefile.b32' to
make the wxWindows core library. Ignore the compiler warnings.
@@ -404,7 +404,7 @@ Metrowerks CodeWarrior compilation
----------------------------------
1. CodeWarrior Pro7 project files in XML format are already
- included in wxMSW-2.3.3.zip and the setup version.
+ included in wxMSW-2.3.4.zip and the setup version.
2. Review the file include\wx\msw\setup.h (or include\wx\msw\setup0.h if
you are working from the CVS version) to make sure the settings reflect
what you want. If you aren't sure, leave it alone and go with the
diff --git a/docs/os2/install.txt b/docs/os2/install.txt
index 8a86dbb53f..1202b6de32 100644
--- a/docs/os2/install.txt
+++ b/docs/os2/install.txt
@@ -1,7 +1,7 @@
-Installing wxWindows 2.3.3
+Installing wxWindows 2.3.4
--------------------------
-This is wxWindows 2.3.3 for IBM OS/2 Warp3 and Warp4. This is an unstable
+This is wxWindows 2.3.4 for IBM OS/2 Warp3 and Warp4. This is an unstable
development release and OS/2 is considered to be in beta.
IMPORTANT NOTE: If you experience problems installing, please
@@ -17,7 +17,7 @@ Unarchiving
At this time there is no comprehensive setup.exe type installation program.
wxWindows for OS/2 requires you download various .zip files and unpack them
to your desired location on your system. Pick a location say,
-C:\wx\wxWindows-2.3.3, copy the .zip files to there and unzip them ensuring you
+C:\wx\wxWindows-2.3.4, copy the .zip files to there and unzip them ensuring you
unzip the subdirectories as well. You will need:
- All common, generic and OS2-specific wxWindows source;
@@ -30,7 +30,7 @@ unzip the subdirectories as well. You will need:
- PNG library source;
- ZLIB library source;
-All but the documentation is included in wxOS2-2.3.3.zip, documentation
+All but the documentation is included in wxOS2-2.3.4.zip, documentation
must be downloaded separately from the wxWindows Web site.
Other add-on packages are available from the wxWindows Web site, such as:
@@ -46,27 +46,27 @@ General installation notes
After unzipping everything your directory tree should look something like
this:
-x:\wx\wxWindows-2.3.3\docs (your HTML reference manual)
-x:\wx\wxWindows-2.3.3\include\wx
-x:\wx\wxWindows-2.3.3\include\wx\generic
-x:\wx\wxWindows-2.3.3\include\wx\html
-x:\wx\wxWindows-2.3.3\include\wx\os2
-x:\wx\wxWindows-2.3.3\samples\.... (all the sample directories)
-x:\wx\wxWindows-2.3.3\src
-x:\wx\wxWindows-2.3.3\src\common
-x:\wx\wxWindows-2.3.3\src\generic
-x:\wx\wxWindows-2.3.3\src\html
-x:\wx\wxWindows-2.3.3\src\jpeg
-x:\wx\wxWindows-2.3.3\src\os2
-x:\wx\wxWindows-2.3.3\src\png
-x:\wx\wxWindows-2.3.3\src\tiff
-x:\wx\wxWindows-2.3.3\src\zlib
+x:\wx\wxWindows-2.3.4\docs (your HTML reference manual)
+x:\wx\wxWindows-2.3.4\include\wx
+x:\wx\wxWindows-2.3.4\include\wx\generic
+x:\wx\wxWindows-2.3.4\include\wx\html
+x:\wx\wxWindows-2.3.4\include\wx\os2
+x:\wx\wxWindows-2.3.4\samples\.... (all the sample directories)
+x:\wx\wxWindows-2.3.4\src
+x:\wx\wxWindows-2.3.4\src\common
+x:\wx\wxWindows-2.3.4\src\generic
+x:\wx\wxWindows-2.3.4\src\html
+x:\wx\wxWindows-2.3.4\src\jpeg
+x:\wx\wxWindows-2.3.4\src\os2
+x:\wx\wxWindows-2.3.4\src\png
+x:\wx\wxWindows-2.3.4\src\tiff
+x:\wx\wxWindows-2.3.4\src\zlib
If you are using VisualAge, you will also need to ensure you have a
-\lib directory as well, x:\wx\wxWindows-2.3.3\lib
+\lib directory as well, x:\wx\wxWindows-2.3.4\lib
and you will have to set a WXWIN environment variable in your
config.sys,
-SET WXWIN=X:\WX\WXWINDOWS-2.3.3;
+SET WXWIN=X:\WX\WXWINDOWS-2.3.4;
Compilation
-----------
@@ -176,13 +176,13 @@ developping cross-platform applications you might want to compile (and
update) e.g. wxGTK or wxX11 as well.
In the following, let's assume you decided to build in
-\wx\wxWindows-2.3.3\build\pm. Now we need to set some environment
+\wx\wxWindows-2.3.4\build\pm. Now we need to set some environment
variables, namely MAKE_SHELL (to a Unix like shell, let's assume ash)
and INSTALL (to point to the install script. If you omit this, configure
might find something like the system's tcpip\pcomos\install.exe which will
not do the thing you want), e.g.
SET MAKE_SHELL=ash
-SET INSTALL=/wx/wxWindows-2.3.3/install-sh.
+SET INSTALL=/wx/wxWindows-2.3.4/install-sh.
Be warned that depending on the precise version of your make, setting
MAKE_SHELL might not be sufficient, it might be necessary to set SHELL
@@ -224,7 +224,7 @@ Finally, if you also want to build a different port, e.g. wxGTK, you
essentially have to use the procedure described above, the only difference
being that you have to pass a switch to configure indicating which port
to build. If you do not do this in a separate build directory (e.g.
-\wxWindows-2.3.3\build\gtk), you'll have to do a `make clean' first.
+\wxWindows-2.3.4\build\gtk), you'll have to do a `make clean' first.
The magical switches that have to be passed to configure for the various
ports are --with-gtk (wxGTK), --with-motif (wxMotif), --with-x11 (wxX11),
and --disable-gui (wxBase). Note that contrary to the native, PM based
diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt
index b7b4bc6bed..820c71126e 100644
--- a/docs/publicity/announce.txt
+++ b/docs/publicity/announce.txt
@@ -1,4 +1,4 @@
-Announcing wxWindows 2.3.3: a cross-platform GUI toolkit
+Announcing wxWindows 2.3.4: a cross-platform GUI toolkit
----------------------------------------------------------------
September 15th, 2002 -- the wxWindows team is pleased to
diff --git a/docs/readme.txt b/docs/readme.txt
index 989b190a88..e9f0d561de 100644
--- a/docs/readme.txt
+++ b/docs/readme.txt
@@ -1,4 +1,4 @@
-wxWindows 2.3.3
+wxWindows 2.3.4
---------------
*** Please note that this is an UNSTABLE DEVELOPMENT SNAPSHOT.
diff --git a/docs/univ/readme.txt b/docs/univ/readme.txt
index 8325c9f646..d2ceccc77d 100644
--- a/docs/univ/readme.txt
+++ b/docs/univ/readme.txt
@@ -121,6 +121,6 @@ itself, namely:
Vadim Zeitlin
-This file is accurate for the version 2.3.3 of wxUniversal. It was last
+This file is accurate for the version 2.3.4 of wxUniversal. It was last
modified on Apr 15, 2002.
diff --git a/docs/x11/install.txt b/docs/x11/install.txt
index 5239306806..3f0e8c2452 100644
--- a/docs/x11/install.txt
+++ b/docs/x11/install.txt
@@ -11,7 +11,7 @@ IMPORTANT NOTE:
When sending bug reports tell us what version of wxWindows you are
using (including the beta) and what compiler on what system. One
- example: wxX11 2.3.3, gcc 2.95.4, Redhat 6.2
+ example: wxX11 2.3.4, gcc 2.95.4, Redhat 6.2
First steps
-----------
diff --git a/docs/x11/readme.txt b/docs/x11/readme.txt
index 4e8f155377..a9ece6e956 100644
--- a/docs/x11/readme.txt
+++ b/docs/x11/readme.txt
@@ -1,7 +1,7 @@
- Welcome to wxWindows/X11 2.3.3
+ Welcome to wxWindows/X11 2.3.4
-You have downloaded version 2.3.3 of the X11 port of
+You have downloaded version 2.3.4 of the X11 port of
the wxWindows GUI library. This runs on X11 with no
Motif, Xt, GTK+ or any other standard widget set --
instead it uses the wxUniversal widgets. The intention
diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp
index 2ed0bea518..64b945a49a 100644
--- a/samples/artprov/artprov.dsp
+++ b/samples/artprov/artprov.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "artprov - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "artprov - Win32 Release"
diff --git a/samples/calendar/calendar.dsp b/samples/calendar/calendar.dsp
index 124f11083d..08919ead79 100644
--- a/samples/calendar/calendar.dsp
+++ b/samples/calendar/calendar.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "calendar - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "calendar - Win32 Release"
diff --git a/samples/caret/caret.dsp b/samples/caret/caret.dsp
index ed0de2494f..746ccf4de6 100644
--- a/samples/caret/caret.dsp
+++ b/samples/caret/caret.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "caret - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "caret - Win32 Release"
diff --git a/samples/checklst/checklst.dsp b/samples/checklst/checklst.dsp
index 79cb655c10..e054b1ad74 100644
--- a/samples/checklst/checklst.dsp
+++ b/samples/checklst/checklst.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "checklst - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "checklst - Win32 Release"
diff --git a/samples/config/config.dsp b/samples/config/config.dsp
index 90b4a160af..647ef70674 100644
--- a/samples/config/config.dsp
+++ b/samples/config/config.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "config - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "config - Win32 Release"
diff --git a/samples/controls/controls.dsp b/samples/controls/controls.dsp
index 95e8e3be92..58db7cf23f 100644
--- a/samples/controls/controls.dsp
+++ b/samples/controls/controls.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "controls - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "controls - Win32 Release"
diff --git a/samples/db/db.dsp b/samples/db/db.dsp
index c61c33aca3..a908a17237 100644
--- a/samples/db/db.dsp
+++ b/samples/db/db.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "db - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "db - Win32 Release"
diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp
index 17ea64d1c1..5623d849a0 100644
--- a/samples/dialogs/dialogs.dsp
+++ b/samples/dialogs/dialogs.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "dialogs - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "dialogs - Win32 Release"
diff --git a/samples/dialup/dialup.dsp b/samples/dialup/dialup.dsp
index 1a7a78a8bc..9011c20b49 100644
--- a/samples/dialup/dialup.dsp
+++ b/samples/dialup/dialup.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "dialup - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "dialup - Win32 Release"
diff --git a/samples/dnd/dnd.dsp b/samples/dnd/dnd.dsp
index 024a9ec192..cead67d101 100644
--- a/samples/dnd/dnd.dsp
+++ b/samples/dnd/dnd.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "dnd - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "dnd - Win32 Release"
diff --git a/samples/docview/docview.dsp b/samples/docview/docview.dsp
index 1e1e1abc59..da0d2fa32d 100644
--- a/samples/docview/docview.dsp
+++ b/samples/docview/docview.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "docview - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "docview - Win32 Release"
diff --git a/samples/docvwmdi/docvwmdi.dsp b/samples/docvwmdi/docvwmdi.dsp
index a843367163..188d9ca8bd 100644
--- a/samples/docvwmdi/docvwmdi.dsp
+++ b/samples/docvwmdi/docvwmdi.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "docvwmdi - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "docvwmdi - Win32 Release"
diff --git a/samples/dragimag/dragimag.dsp b/samples/dragimag/dragimag.dsp
index d80989db89..f517c935cb 100644
--- a/samples/dragimag/dragimag.dsp
+++ b/samples/dragimag/dragimag.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "dragimag - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "dragimag - Win32 Release"
diff --git a/samples/drawing/drawing.dsp b/samples/drawing/drawing.dsp
index 7e1a570347..e176b48708 100644
--- a/samples/drawing/drawing.dsp
+++ b/samples/drawing/drawing.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "drawing - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "drawing - Win32 Release"
diff --git a/samples/dynamic/dynamic.dsp b/samples/dynamic/dynamic.dsp
index 11e4e00501..71aeeeb4d1 100644
--- a/samples/dynamic/dynamic.dsp
+++ b/samples/dynamic/dynamic.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "dynamic - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "dynamic - Win32 Release"
diff --git a/samples/erase/erase.dsp b/samples/erase/erase.dsp
index 1990f2ac6d..9639339a30 100644
--- a/samples/erase/erase.dsp
+++ b/samples/erase/erase.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "erase - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "erase - Win32 Release"
diff --git a/samples/event/event.dsp b/samples/event/event.dsp
index 8616035750..8dd0b76947 100644
--- a/samples/event/event.dsp
+++ b/samples/event/event.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "event - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "event - Win32 Release"
diff --git a/samples/exec/exec.dsp b/samples/exec/exec.dsp
index 640a992ca7..4397700c56 100644
--- a/samples/exec/exec.dsp
+++ b/samples/exec/exec.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "exec - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "exec - Win32 Release"
diff --git a/samples/font/font.dsp b/samples/font/font.dsp
index 9b86ce10f7..31989639a7 100644
--- a/samples/font/font.dsp
+++ b/samples/font/font.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "font - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "font - Win32 Release"
diff --git a/samples/grid/grid.dsp b/samples/grid/grid.dsp
index f0ddff1d2e..6b333047b4 100644
--- a/samples/grid/grid.dsp
+++ b/samples/grid/grid.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "grid - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "grid - Win32 Release"
diff --git a/samples/help/help.dsp b/samples/help/help.dsp
index c042b68854..686a829fc8 100644
--- a/samples/help/help.dsp
+++ b/samples/help/help.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "help - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "help - Win32 Release"
diff --git a/samples/html/about/about.dsp b/samples/html/about/about.dsp
index bcb82b9b23..f63dd24bbf 100644
--- a/samples/html/about/about.dsp
+++ b/samples/html/about/about.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlabout - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlabout - Win32 Release"
diff --git a/samples/html/help/help.dsp b/samples/html/help/help.dsp
index 35235f621e..e242d63834 100644
--- a/samples/html/help/help.dsp
+++ b/samples/html/help/help.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlhelp - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlhelp - Win32 Release"
diff --git a/samples/html/helpview/helpview.dsp b/samples/html/helpview/helpview.dsp
index 055b077c5e..eb340941f1 100644
--- a/samples/html/helpview/helpview.dsp
+++ b/samples/html/helpview/helpview.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Release"
diff --git a/samples/html/printing/printing.dsp b/samples/html/printing/printing.dsp
index f12717218f..144dbea151 100644
--- a/samples/html/printing/printing.dsp
+++ b/samples/html/printing/printing.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlprinting - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlprinting - Win32 Release"
diff --git a/samples/html/test/test.dsp b/samples/html/test/test.dsp
index 58c5ea3bea..05abd7f3ce 100644
--- a/samples/html/test/test.dsp
+++ b/samples/html/test/test.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmltest - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmltest - Win32 Release"
diff --git a/samples/html/virtual/virtual.dsp b/samples/html/virtual/virtual.dsp
index 12d3189514..ba5ea226b0 100644
--- a/samples/html/virtual/virtual.dsp
+++ b/samples/html/virtual/virtual.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlvirtual - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlvirtual - Win32 Release"
diff --git a/samples/html/widget/widget.dsp b/samples/html/widget/widget.dsp
index 354881b545..1362335885 100644
--- a/samples/html/widget/widget.dsp
+++ b/samples/html/widget/widget.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlwidget - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlwidget - Win32 Release"
diff --git a/samples/html/zip/zip.dsp b/samples/html/zip/zip.dsp
index c3fd85f552..cc022c671a 100644
--- a/samples/html/zip/zip.dsp
+++ b/samples/html/zip/zip.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "htmlzip - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "htmlzip - Win32 Release"
diff --git a/samples/image/image.dsp b/samples/image/image.dsp
index b13f17b54b..7d52e747aa 100644
--- a/samples/image/image.dsp
+++ b/samples/image/image.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "image - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "image - Win32 Release"
diff --git a/samples/internat/internat.dsp b/samples/internat/internat.dsp
index 5bae3cd4e7..9ef0705258 100644
--- a/samples/internat/internat.dsp
+++ b/samples/internat/internat.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "internat - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "internat - Win32 Release"
diff --git a/samples/ipc/client.dsp b/samples/ipc/client.dsp
index 81561b912f..1cd5936efe 100644
--- a/samples/ipc/client.dsp
+++ b/samples/ipc/client.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "ipcclient - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "ipcclient - Win32 Release"
diff --git a/samples/ipc/server.dsp b/samples/ipc/server.dsp
index ef4c46dbe3..aebc681acf 100644
--- a/samples/ipc/server.dsp
+++ b/samples/ipc/server.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "ipcserver - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "ipcserver - Win32 Release"
diff --git a/samples/joytest/joytest.dsp b/samples/joytest/joytest.dsp
index 7c78279668..d4a280e280 100644
--- a/samples/joytest/joytest.dsp
+++ b/samples/joytest/joytest.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "joytest - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "joytest - Win32 Release"
diff --git a/samples/keyboard/keyboard.dsp b/samples/keyboard/keyboard.dsp
index 4e8926962c..ce1a859a26 100644
--- a/samples/keyboard/keyboard.dsp
+++ b/samples/keyboard/keyboard.dsp
@@ -55,7 +55,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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\wxmsw233.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 ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "keyboard - Win32 Debug DLL"
@@ -81,7 +81,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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\wxmsw233d.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 ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "keyboard - Win32 Release"
diff --git a/samples/layout/layout.dsp b/samples/layout/layout.dsp
index ea1fab9559..f041f9d668 100644
--- a/samples/layout/layout.dsp
+++ b/samples/layout/layout.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "layout - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "layout - Win32 Release"
diff --git a/samples/listctrl/listctrl.dsp b/samples/listctrl/listctrl.dsp
index 3705b62a9e..f471bbe9b3 100644
--- a/samples/listctrl/listctrl.dsp
+++ b/samples/listctrl/listctrl.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "listctrl - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "listctrl - Win32 Release"
diff --git a/samples/mdi/mdi.dsp b/samples/mdi/mdi.dsp
index f3aa527a24..5bf18acc94 100644
--- a/samples/mdi/mdi.dsp
+++ b/samples/mdi/mdi.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "mdi - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "mdi - Win32 Release"
diff --git a/samples/memcheck/memcheck.dsp b/samples/memcheck/memcheck.dsp
index 194fb12bbd..eb41f542cd 100644
--- a/samples/memcheck/memcheck.dsp
+++ b/samples/memcheck/memcheck.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "memcheck - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "memcheck - Win32 Release"
diff --git a/samples/menu/menu.dsp b/samples/menu/menu.dsp
index 57f5dd6314..e3c85e709e 100644
--- a/samples/menu/menu.dsp
+++ b/samples/menu/menu.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "menu - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "menu - Win32 Release"
diff --git a/samples/mfc/mfc.dsp b/samples/mfc/mfc.dsp
index 99057a63db..96b2e920d6 100644
--- a/samples/mfc/mfc.dsp
+++ b/samples/mfc/mfc.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "mfc - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "mfc - Win32 Release"
diff --git a/samples/minifram/minifram.dsp b/samples/minifram/minifram.dsp
index ed142ff622..afa6a9adac 100644
--- a/samples/minifram/minifram.dsp
+++ b/samples/minifram/minifram.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "minifram - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "minifram - Win32 Release"
diff --git a/samples/minimal/minimal.dsp b/samples/minimal/minimal.dsp
index 5d16d3a8ad..68653c3032 100644
--- a/samples/minimal/minimal.dsp
+++ b/samples/minimal/minimal.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "minimal - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "minimal - Win32 Release"
diff --git a/samples/nativdlg/nativdlg.dsp b/samples/nativdlg/nativdlg.dsp
index c5505ca1aa..e594b30ede 100644
--- a/samples/nativdlg/nativdlg.dsp
+++ b/samples/nativdlg/nativdlg.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "nativdlg - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "nativdlg - Win32 Release"
diff --git a/samples/newgrid/newgrid.dsp b/samples/newgrid/newgrid.dsp
index cf3ff36050..70662ff198 100644
--- a/samples/newgrid/newgrid.dsp
+++ b/samples/newgrid/newgrid.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "newgrid - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "newgrid - Win32 Release"
diff --git a/samples/notebook/notebook.dsp b/samples/notebook/notebook.dsp
index 3522063182..fc53bafee5 100644
--- a/samples/notebook/notebook.dsp
+++ b/samples/notebook/notebook.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "notebook - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "notebook - Win32 Release"
diff --git a/samples/oleauto/oleauto.dsp b/samples/oleauto/oleauto.dsp
index 269e7e80b9..8e47c7e074 100644
--- a/samples/oleauto/oleauto.dsp
+++ b/samples/oleauto/oleauto.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "oleauto - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "oleauto - Win32 Release"
diff --git a/samples/opengl/cube/cube.dsp b/samples/opengl/cube/cube.dsp
index 9e1ffbb5d9..e9ef1ae99d 100644
--- a/samples/opengl/cube/cube.dsp
+++ b/samples/opengl/cube/cube.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "glcube - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "glcube - Win32 Release"
diff --git a/samples/opengl/isosurf/isosurf.dsp b/samples/opengl/isosurf/isosurf.dsp
index fad1e23e3d..e48e1cdab8 100644
--- a/samples/opengl/isosurf/isosurf.dsp
+++ b/samples/opengl/isosurf/isosurf.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "glisosurf - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "glisosurf - Win32 Release"
diff --git a/samples/opengl/penguin/penguin.dsp b/samples/opengl/penguin/penguin.dsp
index 0f39e4f367..5bfeda5b70 100644
--- a/samples/opengl/penguin/penguin.dsp
+++ b/samples/opengl/penguin/penguin.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ../../..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "glpenguin - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ../../..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "glpenguin - Win32 Release"
diff --git a/samples/ownerdrw/ownerdrw.dsp b/samples/ownerdrw/ownerdrw.dsp
index b7f3fed3a0..8c204b30c8 100644
--- a/samples/ownerdrw/ownerdrw.dsp
+++ b/samples/ownerdrw/ownerdrw.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "ownerdrw - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "ownerdrw - Win32 Release"
diff --git a/samples/png/png.dsp b/samples/png/png.dsp
index 52de544a6b..478bb60ac0 100644
--- a/samples/png/png.dsp
+++ b/samples/png/png.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "png - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "png - Win32 Release"
diff --git a/samples/printing/printing.dsp b/samples/printing/printing.dsp
index 6215f45a24..bf35097fa6 100644
--- a/samples/printing/printing.dsp
+++ b/samples/printing/printing.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "printing - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "printing - Win32 Release"
diff --git a/samples/proplist/proplist.dsp b/samples/proplist/proplist.dsp
index 53b4bde49b..d2d4c4ea52 100644
--- a/samples/proplist/proplist.dsp
+++ b/samples/proplist/proplist.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "proplist - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "proplist - Win32 Release"
diff --git a/samples/propsize/propsize.dsp b/samples/propsize/propsize.dsp
index c8bcc99c87..b2ec33dee9 100644
--- a/samples/propsize/propsize.dsp
+++ b/samples/propsize/propsize.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "propsize - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "propsize - Win32 Release"
diff --git a/samples/regtest/regtest.dsp b/samples/regtest/regtest.dsp
index 4196beec12..8ba41cfb85 100644
--- a/samples/regtest/regtest.dsp
+++ b/samples/regtest/regtest.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "regtest - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "regtest - Win32 Release"
diff --git a/samples/resource/resource.dsp b/samples/resource/resource.dsp
index 5010adc6ec..f98ad240e1 100644
--- a/samples/resource/resource.dsp
+++ b/samples/resource/resource.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "resource - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "resource - Win32 Release"
diff --git a/samples/rotate/rotate.dsp b/samples/rotate/rotate.dsp
index 64c9c8cef8..b0473e281a 100644
--- a/samples/rotate/rotate.dsp
+++ b/samples/rotate/rotate.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "rotate - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "rotate - Win32 Release"
diff --git a/samples/sashtest/sashtest.dsp b/samples/sashtest/sashtest.dsp
index 06f6f2ea78..f79f10a371 100644
--- a/samples/sashtest/sashtest.dsp
+++ b/samples/sashtest/sashtest.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "sashtest - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "sashtest - Win32 Release"
diff --git a/samples/scroll/scroll.dsp b/samples/scroll/scroll.dsp
index 966357cb90..b90a9b3e9e 100644
--- a/samples/scroll/scroll.dsp
+++ b/samples/scroll/scroll.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "scroll - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "scroll - Win32 Release"
diff --git a/samples/scrollsub/scrollsub.dsp b/samples/scrollsub/scrollsub.dsp
index a635c0fa63..bb4b3a7a76 100644
--- a/samples/scrollsub/scrollsub.dsp
+++ b/samples/scrollsub/scrollsub.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "scrollsub - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "scrollsub - Win32 Release"
diff --git a/samples/sockets/client.dsp b/samples/sockets/client.dsp
index b99f0b4a75..d036b6965b 100644
--- a/samples/sockets/client.dsp
+++ b/samples/sockets/client.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "socketclient - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "socketclient - Win32 Release"
diff --git a/samples/sockets/server.dsp b/samples/sockets/server.dsp
index d351a219ec..fb29544656 100644
--- a/samples/sockets/server.dsp
+++ b/samples/sockets/server.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "socketserver - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "socketserver - Win32 Release"
diff --git a/samples/splitter/splitter.dsp b/samples/splitter/splitter.dsp
index ac28cbb35c..a5753db6d5 100644
--- a/samples/splitter/splitter.dsp
+++ b/samples/splitter/splitter.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "splitter - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "splitter - Win32 Release"
diff --git a/samples/statbar/statbar.dsp b/samples/statbar/statbar.dsp
index 5fb4fbad83..0cedeb6d1a 100644
--- a/samples/statbar/statbar.dsp
+++ b/samples/statbar/statbar.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "statbar - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "statbar - Win32 Release"
diff --git a/samples/taskbar/taskbar.dsp b/samples/taskbar/taskbar.dsp
index 109141eefd..2f289f912e 100644
--- a/samples/taskbar/taskbar.dsp
+++ b/samples/taskbar/taskbar.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "taskbar - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "taskbar - Win32 Release"
diff --git a/samples/text/text.dsp b/samples/text/text.dsp
index 53583d6985..c598fb4365 100644
--- a/samples/text/text.dsp
+++ b/samples/text/text.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "text - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "text - Win32 Release"
diff --git a/samples/thread/thread.dsp b/samples/thread/thread.dsp
index 6da91b11b8..23a3a2d8eb 100644
--- a/samples/thread/thread.dsp
+++ b/samples/thread/thread.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "thread - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "thread - Win32 Release"
diff --git a/samples/toolbar/toolbar.dsp b/samples/toolbar/toolbar.dsp
index cbd5496aa0..1366a76937 100644
--- a/samples/toolbar/toolbar.dsp
+++ b/samples/toolbar/toolbar.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "toolbar - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "toolbar - Win32 Release"
diff --git a/samples/toolbar/toolbarM5.xml b/samples/toolbar/toolbarM5.xml
index b8bcb3dfc8..ffc8e09601 100644
--- a/samples/toolbar/toolbarM5.xml
+++ b/samples/toolbar/toolbarM5.xml
@@ -480,3176 +480,4 @@
MWMerge_MacOS_copyResources1
MWMerge_MacOS_skipResources
- {Ð
- %#H
- %8*
-
-
-
- MWCodeGen_PPC_structalignmentPPC
- MWCodeGen_PPC_tracebacktablesNone
- MWCodeGen_PPC_processorGeneric
- MWCodeGen_PPC_readonlystrings0
- MWCodeGen_PPC_tocdata1
- MWCodeGen_PPC_profiler0
- MWCodeGen_PPC_fpcontract1
- MWCodeGen_PPC_schedule0
- MWCodeGen_PPC_peephole1
- MWCodeGen_PPC_processorspecific0
- MWCodeGen_PPC_altivec0
- MWCodeGen_PPC_vectortocdata0
- MWCodeGen_PPC_vrsave0
-
-
- MWDisassembler_PPC_showcode1
- MWDisassembler_PPC_extended1
- MWDisassembler_PPC_mix0
- MWDisassembler_PPC_nohex0
- MWDisassembler_PPC_showdata1
- MWDisassembler_PPC_showexceptions1
- MWDisassembler_PPC_showsym0
- MWDisassembler_PPC_shownames1
-
-
- GlobalOptimizer_PPC_optimizationlevelLevel0
- GlobalOptimizer_PPC_optforSpeed
-
-
- MWLinker_PPC_linksym1
- MWLinker_PPC_symfullpath1
- MWLinker_PPC_linkmap0
- MWLinker_PPC_nolinkwarnings0
- MWLinker_PPC_dontdeadstripinitcode0
- MWLinker_PPC_permitmultdefs0
- MWLinker_PPC_linkmodeFast
- MWLinker_PPC_initname
- MWLinker_PPC_mainname__start
- MWLinker_PPC_termname
- PPC Mach-O CodeGen
- 0001000001010000010000000001010101000000
-
- PPC Mach-O Linker
- 0001000000000100000100000000000000000000000000000000000000007374
- 6172740000000000000000000000000000000000000000000000000000000000
- 000000000000000000000000000000000000000000000000000000000000
-
- PPC Mach-O Target
- 0001000005612E6F757400000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000
-
-
-
- MWPEF_exportsNone
- MWPEF_libfolder0
- MWPEF_sortcodeNone
- MWPEF_expandbss0
- MWPEF_sharedata0
- MWPEF_olddefversion0
- MWPEF_oldimpversion0
- MWPEF_currentversion0
- MWPEF_fragmentname
- MWPEF_collapsereloads0
-
-
- MWProject_PPC_typeApplication
- MWProject_PPC_outfiletoolbar Classic Release
- MWProject_PPC_filecreator1061109567
- MWProject_PPC_filetype1095782476
- MWProject_PPC_size3840
- MWProject_PPC_minsize3840
- MWProject_PPC_stacksize64
- MWProject_PPC_flags22720
- MWProject_PPC_symfilename
- MWProject_PPC_rsrcname
- MWProject_PPC_rsrcheaderNative
- MWProject_PPC_rsrctype1061109567
- MWProject_PPC_rsrcid0
- MWProject_PPC_rsrcflags0
- MWProject_PPC_rsrcstore0
- MWProject_PPC_rsrcmerge0
-
-
- MWAssembler_PPC_auxheader0
- MWAssembler_PPC_symmodeMac
- MWAssembler_PPC_dialectPPC
- MWAssembler_PPC_prefixfile
- MWAssembler_PPC_typecheck0
- MWAssembler_PPC_warnings0
- MWAssembler_PPC_casesensitive0
-
-
- MWRez_Language_maxwidth80
- MWRez_Language_scriptRoman
- MWRez_Language_alignmentAlign1
- MWRez_Language_filtermodeFilterSkip
- MWRez_Language_suppresswarnings0
- MWRez_Language_escapecontrolchars1
- MWRez_Language_prefixname
- MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT'
-
-
-
- Name
- wx_PPC.lib
- MacOS
- Library
- Debug
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- MSL C.PPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- console.stubs.c
- MacOS
- Text
-
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- wx_PPC.rsrc
- MacOS
- Resource
-
-
-
- Name
- tiff.lib
- MacOS
- Library
-
-
-
- Name
- jpeg.lib
- MacOS
- Library
-
-
-
- Name
- png.lib
- MacOS
- Library
-
-
-
- Name
- zlib.lib
- MacOS
- Library
-
-
-
- Name
- toolbar.cpp
- MacOS
- Text
-
-
-
- Name
- AppearanceLib
- MacOS
- Library
-
-
-
- Name
- ATSUnicodeLib
- MacOS
- Library
-
-
-
- Name
- CarbonAccessors.o
- MacOS
- Library
-
-
-
- Name
- ControlsLib
- MacOS
- Library
-
-
-
- Name
- CursorDevicesGlue.o
- MacOS
- Library
-
-
-
- Name
- DialogsLib
- MacOS
- Library
-
-
-
- Name
- DragLib
- MacOS
- Library
-
-
-
- Name
- InterfaceLib
- MacOS
- Library
-
-
-
- Name
- InternetConfigLib
- MacOS
- Library
-
-
-
- Name
- WindowsLib
- MacOS
- Library
-
-
-
- Name
- MathLib
- MacOS
- Library
-
-
-
- Name
- MenusLib
- MacOS
- Library
-
-
-
- Name
- NavigationLib
- MacOS
- Library
-
-
-
- Name
- OpenTptAppleTalkLib
- MacOS
- Library
-
-
-
- Name
- OpenTptATalkPPC.o
- MacOS
- Library
-
-
-
- Name
- OpenTptInetPPC.o
- MacOS
- Library
-
-
-
- Name
- OpenTptInternetLib
- MacOS
- Library
-
-
-
- Name
- OpenTransportLib
- MacOS
- Library
-
-
-
- Name
- OpenTransportAppPPC.o
- MacOS
- Library
-
-
-
- Name
- PLStringFuncsPPC.lib
- MacOS
- Library
-
-
-
- Name
- TextEncodingConverter
- MacOS
- Library
-
-
-
- Name
- Textension
- MacOS
- Library
-
-
-
- Name
- ThreadsLib
- MacOS
- Library
-
-
-
- Name
- UnicodeConverter
- MacOS
- Library
-
-
-
-
-
- Name
- wx_PPC.lib
- MacOS
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
-
-
- Name
- MSL C.PPC.Lib
- MacOS
-
-
- Name
- console.stubs.c
- MacOS
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
-
-
- Name
- wx_PPC.rsrc
- MacOS
-
-
- Name
- tiff.lib
- MacOS
-
-
- Name
- jpeg.lib
- MacOS
-
-
- Name
- png.lib
- MacOS
-
-
- Name
- zlib.lib
- MacOS
-
-
- Name
- toolbar.cpp
- MacOS
-
-
- Name
- AppearanceLib
- MacOS
-
-
- Name
- ATSUnicodeLib
- MacOS
-
-
- Name
- CarbonAccessors.o
- MacOS
-
-
- Name
- ControlsLib
- MacOS
-
-
- Name
- CursorDevicesGlue.o
- MacOS
-
-
- Name
- DialogsLib
- MacOS
-
-
- Name
- DragLib
- MacOS
-
-
- Name
- InterfaceLib
- MacOS
-
-
- Name
- InternetConfigLib
- MacOS
-
-
- Name
- WindowsLib
- MacOS
-
-
- Name
- MathLib
- MacOS
-
-
- Name
- MenusLib
- MacOS
-
-
- Name
- NavigationLib
- MacOS
-
-
- Name
- OpenTptAppleTalkLib
- MacOS
-
-
- Name
- OpenTptATalkPPC.o
- MacOS
-
-
- Name
- OpenTptInetPPC.o
- MacOS
-
-
- Name
- OpenTptInternetLib
- MacOS
-
-
- Name
- OpenTransportLib
- MacOS
-
-
- Name
- OpenTransportAppPPC.o
- MacOS
-
-
- Name
- PLStringFuncsPPC.lib
- MacOS
-
-
- Name
- TextEncodingConverter
- MacOS
-
-
- Name
- Textension
- MacOS
-
-
- Name
- ThreadsLib
- MacOS
-
-
- Name
- UnicodeConverter
- MacOS
-
-
-
-
- Classic Debug
-
-
-
- UserSourceTrees
-
-
- CustomColor1
- Red0
- Green32767
- Blue0
-
- CustomColor2
- Red0
- Green32767
- Blue0
-
- CustomColor3
- Red0
- Green32767
- Blue0
-
- CustomColor4
- Red0
- Green32767
- Blue0
-
-
-
- AlwaysSearchUserPathstrue
- InterpretDOSAndUnixPathstrue
- UserSearchPaths
-
- SearchPath
- Path:
- PathFormatMacOS
- PathRootProject
-
- Recursivetrue
- HostFlagsAll
-
-
- SearchPath
- Path:::include:
- PathFormatMacOS
- PathRootProject
-
- Recursivefalse
- HostFlagsAll
-
-
- SearchPath
- Path:::lib:
- PathFormatMacOS
- PathRootProject
-
- Recursivetrue
- HostFlagsAll
-
-
- SystemSearchPaths
-
- SearchPath
- PathMSL
- PathFormatWindows
- PathRootCodeWarrior
-
- Recursivetrue
- HostFlagsAll
-
-
- SearchPath
- Path:MacOS Support:
- PathFormatMacOS
- PathRootCodeWarrior
-
- Recursivetrue
- HostFlagsAll
-
-
-
-
- LinkerMacOS PPC Linker
- PreLinker
- PostLinker
- TargetnameClassic Debug
- OutputDirectory
- Path:
- PathFormatMacOS
- PathRootProject
-
- SaveEntriesUsingRelativePathsfalse
-
-
- FileMappings
-
- FileTypeAPPL
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeAppl
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeMMLB
- FileExtension
- CompilerLib Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeMPLF
- FileExtension
- CompilerLib Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeMWCD
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeRSRC
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.c
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.c++
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cc
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cp
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cpp
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.exp
- Compiler
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.h
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMaketrue
-
-
- FileTypeTEXT
- FileExtension.pch
- CompilerMW C/C++ PPC
- Precompiletrue
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.pch++
- CompilerMW C/C++ PPC
- Precompiletrue
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.r
- CompilerRez
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeXCOF
- FileExtension
- CompilerXCOFF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypedocu
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypersrc
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeshlb
- FileExtension
- CompilerPEF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypestub
- FileExtension
- CompilerPEF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileExtension.doc
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFilefalse
- IgnoredByMaketrue
-
-
- FileExtension.o
- CompilerXCOFF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileExtension.ppob
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileExtension.rsrc
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
-
-
- CacheModDatestrue
- ActivateBrowsertrue
- DumpBrowserInfofalse
- CacheSubprojectstrue
- UseThirdPartyDebuggerfalse
- DebuggerCommandLine
- Debugger Runtime
- 0002000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 000000000000000000000000000000000E2D755010000000000001000E2D7E60
- 0002000000000000000000000E2D2DD000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000
-
-
-
- LogSystemMessagestrue
- AutoTargetDLLsfalse
- StopAtWatchpointstrue
- PauseWhileRunningfalse
- PauseInterval5
- PauseUIFlags0
- AltExePath
- Path
- PathFormatGeneric
- PathRootAbsolute
-
- StopAtTempBPOnLaunchtrue
- CacheSymbolicstrue
- TempBPFunctionNamemain
- TempBPTypefalse
-
-
- MWFrontEnd_C_cplusplus0
- MWFrontEnd_C_checkprotos0
- MWFrontEnd_C_arm0
- MWFrontEnd_C_trigraphs0
- MWFrontEnd_C_onlystdkeywords0
- MWFrontEnd_C_enumsalwaysint0
- MWFrontEnd_C_mpwpointerstyle0
- MWFrontEnd_C_prefixname/wx/wx_cw_d.h
- MWFrontEnd_C_ansistrict0
- MWFrontEnd_C_mpwcnewline1
- MWFrontEnd_C_wchar_type1
- MWFrontEnd_C_enableexceptions1
- MWFrontEnd_C_dontreusestrings0
- MWFrontEnd_C_poolstrings0
- MWFrontEnd_C_dontinline0
- MWFrontEnd_C_useRTTI1
- MWFrontEnd_C_multibyteaware0
- MWFrontEnd_C_unsignedchars1
- MWFrontEnd_C_autoinline0
- MWFrontEnd_C_booltruefalse1
- MWFrontEnd_C_direct_to_som0
- MWFrontEnd_C_som_env_check0
- MWFrontEnd_C_alwaysinline0
- MWFrontEnd_C_inlinelevel0
- MWFrontEnd_C_ecplusplus0
- MWFrontEnd_C_objective_c0
- MWFrontEnd_C_defer_codegen0
-
-
- MWWarning_C_warn_illpragma1
- MWWarning_C_warn_emptydecl1
- MWWarning_C_warn_possunwant1
- MWWarning_C_warn_unusedvar0
- MWWarning_C_warn_unusedarg0
- MWWarning_C_warn_extracomma0
- MWWarning_C_pedantic1
- MWWarning_C_warningerrors0
- MWWarning_C_warn_hidevirtual1
- MWWarning_C_warn_implicitconv1
- MWWarning_C_warn_notinlined1
- MWWarning_C_warn_structclass1
-
-
- MWMerge_MacOS_projectTypeApplication
- MWMerge_MacOS_outputNameMerge Out
- MWMerge_MacOS_outputCreator1061109567
- MWMerge_MacOS_outputType1095782476
- MWMerge_MacOS_suppressWarning0
- MWMerge_MacOS_copyFragments1
- MWMerge_MacOS_copyResources1
- MWMerge_MacOS_skipResources
-
- {Ð
- %#H
- %8*
-
-
-
- MWCodeGen_PPC_structalignmentPPC
- MWCodeGen_PPC_tracebacktablesInline
- MWCodeGen_PPC_processorGeneric
- MWCodeGen_PPC_readonlystrings0
- MWCodeGen_PPC_tocdata1
- MWCodeGen_PPC_profiler0
- MWCodeGen_PPC_fpcontract1
- MWCodeGen_PPC_schedule0
- MWCodeGen_PPC_peephole1
- MWCodeGen_PPC_processorspecific0
- MWCodeGen_PPC_altivec0
- MWCodeGen_PPC_vectortocdata0
- MWCodeGen_PPC_vrsave0
-
-
- MWDisassembler_PPC_showcode1
- MWDisassembler_PPC_extended1
- MWDisassembler_PPC_mix0
- MWDisassembler_PPC_nohex0
- MWDisassembler_PPC_showdata1
- MWDisassembler_PPC_showexceptions1
- MWDisassembler_PPC_showsym0
- MWDisassembler_PPC_shownames1
-
-
- GlobalOptimizer_PPC_optimizationlevelLevel0
- GlobalOptimizer_PPC_optforSpeed
-
-
- MWLinker_PPC_linksym1
- MWLinker_PPC_symfullpath1
- MWLinker_PPC_linkmap0
- MWLinker_PPC_nolinkwarnings0
- MWLinker_PPC_dontdeadstripinitcode0
- MWLinker_PPC_permitmultdefs0
- MWLinker_PPC_linkmodeFast
- MWLinker_PPC_initname
- MWLinker_PPC_mainname__start
- MWLinker_PPC_termname
- PPC Mach-O CodeGen
- 0001000001010000010000000001010101000000
-
- PPC Mach-O Linker
- 0001000000000100000100000000000000000000000000000000000000007374
- 6172740000000000000000000000000000000000000000000000000000000000
- 000000000000000000000000000000000000000000000000000000000000
-
- PPC Mach-O Target
- 0001000005612E6F757400000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000
-
-
-
- MWPEF_exportsNone
- MWPEF_libfolder0
- MWPEF_sortcodeNone
- MWPEF_expandbss0
- MWPEF_sharedata0
- MWPEF_olddefversion0
- MWPEF_oldimpversion0
- MWPEF_currentversion0
- MWPEF_fragmentname
- MWPEF_collapsereloads0
-
-
- MWProject_PPC_typeApplication
- MWProject_PPC_outfiletoolbar Classic Debug
- MWProject_PPC_filecreator1061109567
- MWProject_PPC_filetype1095782476
- MWProject_PPC_size3840
- MWProject_PPC_minsize3840
- MWProject_PPC_stacksize64
- MWProject_PPC_flags22720
- MWProject_PPC_symfilename
- MWProject_PPC_rsrcname
- MWProject_PPC_rsrcheaderNative
- MWProject_PPC_rsrctype1061109567
- MWProject_PPC_rsrcid0
- MWProject_PPC_rsrcflags0
- MWProject_PPC_rsrcstore0
- MWProject_PPC_rsrcmerge0
-
-
- MWAssembler_PPC_auxheader0
- MWAssembler_PPC_symmodeMac
- MWAssembler_PPC_dialectPPC
- MWAssembler_PPC_prefixfile
- MWAssembler_PPC_typecheck0
- MWAssembler_PPC_warnings0
- MWAssembler_PPC_casesensitive0
-
-
- MWRez_Language_maxwidth80
- MWRez_Language_scriptRoman
- MWRez_Language_alignmentAlign1
- MWRez_Language_filtermodeFilterSkip
- MWRez_Language_suppresswarnings0
- MWRez_Language_escapecontrolchars1
- MWRez_Language_prefixname
- MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT'
-
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- MSL C.PPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- console.stubs.c
- MacOS
- Text
- Debug
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- wx_PPC_d.lib
- MacOS
- Library
- Debug
-
-
- Name
- wx_PPC.rsrc
- MacOS
- Resource
- Debug
-
-
- Name
- zlib.lib
- MacOS
- Library
- Debug
-
-
- Name
- png.lib
- MacOS
- Library
- Debug
-
-
- Name
- tiffd.lib
- MacOS
- Library
- Debug
-
-
- Name
- jpeg.lib
- MacOS
- Library
- Debug
-
-
- Name
- toolbar.cpp
- MacOS
- Text
- Debug
-
-
- Name
- AppearanceLib
- MacOS
- Library
- Debug
-
-
- Name
- ATSUnicodeLib
- MacOS
- Library
- Debug
-
-
- Name
- CarbonAccessors.o
- MacOS
- Library
- Debug
-
-
- Name
- ControlsLib
- MacOS
- Library
- Debug
-
-
- Name
- CursorDevicesGlue.o
- MacOS
- Library
- Debug
-
-
- Name
- DialogsLib
- MacOS
- Library
- Debug
-
-
- Name
- DragLib
- MacOS
- Library
- Debug
-
-
- Name
- InterfaceLib
- MacOS
- Library
- Debug
-
-
- Name
- InternetConfigLib
- MacOS
- Library
- Debug
-
-
- Name
- WindowsLib
- MacOS
- Library
- Debug
-
-
- Name
- MathLib
- MacOS
- Library
- Debug
-
-
- Name
- MenusLib
- MacOS
- Library
- Debug
-
-
- Name
- NavigationLib
- MacOS
- Library
- Debug
-
-
- Name
- OpenTptAppleTalkLib
- MacOS
- Library
- Debug
-
-
- Name
- OpenTptATalkPPC.o
- MacOS
- Library
- Debug
-
-
- Name
- OpenTptInetPPC.o
- MacOS
- Library
- Debug
-
-
- Name
- OpenTptInternetLib
- MacOS
- Library
- Debug
-
-
- Name
- OpenTransportLib
- MacOS
- Library
- Debug
-
-
- Name
- OpenTransportAppPPC.o
- MacOS
- Library
- Debug
-
-
- Name
- PLStringFuncsPPC.lib
- MacOS
- Library
- Debug
-
-
- Name
- TextEncodingConverter
- MacOS
- Library
- Debug
-
-
- Name
- Textension
- MacOS
- Library
- Debug
-
-
- Name
- ThreadsLib
- MacOS
- Library
- Debug
-
-
- Name
- UnicodeConverter
- MacOS
- Library
- Debug
-
-
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
-
-
- Name
- MSL C.PPC.Lib
- MacOS
-
-
- Name
- console.stubs.c
- MacOS
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
-
-
- Name
- wx_PPC_d.lib
- MacOS
-
-
- Name
- wx_PPC.rsrc
- MacOS
-
-
- Name
- zlib.lib
- MacOS
-
-
- Name
- png.lib
- MacOS
-
-
- Name
- tiffd.lib
- MacOS
-
-
- Name
- jpeg.lib
- MacOS
-
-
- Name
- toolbar.cpp
- MacOS
-
-
- Name
- AppearanceLib
- MacOS
-
-
- Name
- ATSUnicodeLib
- MacOS
-
-
- Name
- CarbonAccessors.o
- MacOS
-
-
- Name
- ControlsLib
- MacOS
-
-
- Name
- CursorDevicesGlue.o
- MacOS
-
-
- Name
- DialogsLib
- MacOS
-
-
- Name
- DragLib
- MacOS
-
-
- Name
- InterfaceLib
- MacOS
-
-
- Name
- InternetConfigLib
- MacOS
-
-
- Name
- WindowsLib
- MacOS
-
-
- Name
- MathLib
- MacOS
-
-
- Name
- MenusLib
- MacOS
-
-
- Name
- NavigationLib
- MacOS
-
-
- Name
- OpenTptAppleTalkLib
- MacOS
-
-
- Name
- OpenTptATalkPPC.o
- MacOS
-
-
- Name
- OpenTptInetPPC.o
- MacOS
-
-
- Name
- OpenTptInternetLib
- MacOS
-
-
- Name
- OpenTransportLib
- MacOS
-
-
- Name
- OpenTransportAppPPC.o
- MacOS
-
-
- Name
- PLStringFuncsPPC.lib
- MacOS
-
-
- Name
- TextEncodingConverter
- MacOS
-
-
- Name
- Textension
- MacOS
-
-
- Name
- ThreadsLib
- MacOS
-
-
- Name
- UnicodeConverter
- MacOS
-
-
-
-
- Carbon Debug
-
-
-
- UserSourceTrees
-
-
- CustomColor1
- Red0
- Green32767
- Blue0
-
- CustomColor2
- Red0
- Green32767
- Blue0
-
- CustomColor3
- Red0
- Green32767
- Blue0
-
- CustomColor4
- Red0
- Green32767
- Blue0
-
-
-
- AlwaysSearchUserPathstrue
- InterpretDOSAndUnixPathstrue
- UserSearchPaths
-
- SearchPath
- Path:
- PathFormatMacOS
- PathRootProject
-
- Recursivetrue
- HostFlagsAll
-
-
- SearchPath
- Path:::include:
- PathFormatMacOS
- PathRootProject
-
- Recursivefalse
- HostFlagsAll
-
-
- SearchPath
- Path:::lib:
- PathFormatMacOS
- PathRootProject
-
- Recursivetrue
- HostFlagsAll
-
-
- SystemSearchPaths
-
- SearchPath
- PathMSL
- PathFormatWindows
- PathRootCodeWarrior
-
- Recursivetrue
- HostFlagsAll
-
-
- SearchPath
- Path:MacOS Support:
- PathFormatMacOS
- PathRootCodeWarrior
-
- Recursivetrue
- HostFlagsAll
-
-
-
-
- LinkerMacOS PPC Linker
- PreLinker
- PostLinker
- TargetnameCarbon Debug
- OutputDirectory
- Path:
- PathFormatMacOS
- PathRootProject
-
- SaveEntriesUsingRelativePathsfalse
-
-
- FileMappings
-
- FileTypeAPPL
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeAppl
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeMMLB
- FileExtension
- CompilerLib Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeMPLF
- FileExtension
- CompilerLib Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeMWCD
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeRSRC
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.c
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.c++
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cc
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cp
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cpp
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.exp
- Compiler
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.h
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMaketrue
-
-
- FileTypeTEXT
- FileExtension.pch
- CompilerMW C/C++ PPC
- Precompiletrue
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.pch++
- CompilerMW C/C++ PPC
- Precompiletrue
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.r
- CompilerRez
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeXCOF
- FileExtension
- CompilerXCOFF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypedocu
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypersrc
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeshlb
- FileExtension
- CompilerPEF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypestub
- FileExtension
- CompilerPEF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileExtension.doc
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFilefalse
- IgnoredByMaketrue
-
-
- FileExtension.o
- CompilerXCOFF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileExtension.ppob
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileExtension.rsrc
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
-
-
- CacheModDatestrue
- ActivateBrowsertrue
- DumpBrowserInfofalse
- CacheSubprojectstrue
- UseThirdPartyDebuggerfalse
- DebuggerCommandLine
- Debugger Runtime
- 0002000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000
-
-
-
- LogSystemMessagestrue
- AutoTargetDLLsfalse
- StopAtWatchpointstrue
- PauseWhileRunningfalse
- PauseInterval5
- PauseUIFlags0
- AltExePath
- Path
- PathFormatGeneric
- PathRootAbsolute
-
- StopAtTempBPOnLaunchtrue
- CacheSymbolicstrue
- TempBPFunctionNamemain
- TempBPTypefalse
-
-
- MWFrontEnd_C_cplusplus0
- MWFrontEnd_C_checkprotos0
- MWFrontEnd_C_arm0
- MWFrontEnd_C_trigraphs0
- MWFrontEnd_C_onlystdkeywords0
- MWFrontEnd_C_enumsalwaysint0
- MWFrontEnd_C_mpwpointerstyle0
- MWFrontEnd_C_prefixname/wx/wx_cwc_d.h
- MWFrontEnd_C_ansistrict0
- MWFrontEnd_C_mpwcnewline1
- MWFrontEnd_C_wchar_type1
- MWFrontEnd_C_enableexceptions1
- MWFrontEnd_C_dontreusestrings0
- MWFrontEnd_C_poolstrings0
- MWFrontEnd_C_dontinline0
- MWFrontEnd_C_useRTTI1
- MWFrontEnd_C_multibyteaware0
- MWFrontEnd_C_unsignedchars1
- MWFrontEnd_C_autoinline0
- MWFrontEnd_C_booltruefalse1
- MWFrontEnd_C_direct_to_som0
- MWFrontEnd_C_som_env_check0
- MWFrontEnd_C_alwaysinline0
- MWFrontEnd_C_inlinelevel0
- MWFrontEnd_C_ecplusplus0
- MWFrontEnd_C_objective_c0
- MWFrontEnd_C_defer_codegen0
-
-
- MWWarning_C_warn_illpragma1
- MWWarning_C_warn_emptydecl1
- MWWarning_C_warn_possunwant1
- MWWarning_C_warn_unusedvar0
- MWWarning_C_warn_unusedarg0
- MWWarning_C_warn_extracomma0
- MWWarning_C_pedantic1
- MWWarning_C_warningerrors0
- MWWarning_C_warn_hidevirtual1
- MWWarning_C_warn_implicitconv1
- MWWarning_C_warn_notinlined1
- MWWarning_C_warn_structclass1
-
-
- MWMerge_MacOS_projectTypeApplication
- MWMerge_MacOS_outputNameMerge Out
- MWMerge_MacOS_outputCreator1061109567
- MWMerge_MacOS_outputType1095782476
- MWMerge_MacOS_suppressWarning0
- MWMerge_MacOS_copyFragments1
- MWMerge_MacOS_copyResources1
- MWMerge_MacOS_skipResources
-
- {Ð
- %#H
- %8*
-
-
-
- MWCodeGen_PPC_structalignmentPPC
- MWCodeGen_PPC_tracebacktablesInline
- MWCodeGen_PPC_processorGeneric
- MWCodeGen_PPC_readonlystrings0
- MWCodeGen_PPC_tocdata1
- MWCodeGen_PPC_profiler0
- MWCodeGen_PPC_fpcontract1
- MWCodeGen_PPC_schedule0
- MWCodeGen_PPC_peephole1
- MWCodeGen_PPC_processorspecific0
- MWCodeGen_PPC_altivec0
- MWCodeGen_PPC_vectortocdata0
- MWCodeGen_PPC_vrsave0
-
-
- MWDisassembler_PPC_showcode1
- MWDisassembler_PPC_extended1
- MWDisassembler_PPC_mix0
- MWDisassembler_PPC_nohex0
- MWDisassembler_PPC_showdata1
- MWDisassembler_PPC_showexceptions1
- MWDisassembler_PPC_showsym0
- MWDisassembler_PPC_shownames1
-
-
- GlobalOptimizer_PPC_optimizationlevelLevel0
- GlobalOptimizer_PPC_optforSpeed
-
-
- MWLinker_PPC_linksym1
- MWLinker_PPC_symfullpath1
- MWLinker_PPC_linkmap0
- MWLinker_PPC_nolinkwarnings0
- MWLinker_PPC_dontdeadstripinitcode0
- MWLinker_PPC_permitmultdefs0
- MWLinker_PPC_linkmodeFast
- MWLinker_PPC_initname
- MWLinker_PPC_mainname__start
- MWLinker_PPC_termname
- PPC Mach-O CodeGen
- 0001000001010000010000000001010101000000
-
- PPC Mach-O Linker
- 0001000000000100000100000000000000000000000000000000000000007374
- 6172740000000000000000000000000000000000000000000000000000000000
- 000000000000000000000000000000000000000000000000000000000000
-
- PPC Mach-O Target
- 0001000005612E6F757400000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000
-
-
-
- MWPEF_exportsNone
- MWPEF_libfolder0
- MWPEF_sortcodeNone
- MWPEF_expandbss0
- MWPEF_sharedata0
- MWPEF_olddefversion0
- MWPEF_oldimpversion0
- MWPEF_currentversion0
- MWPEF_fragmentname
- MWPEF_collapsereloads0
-
-
- MWProject_PPC_typeApplication
- MWProject_PPC_outfiletoolbar Carbon Debug
- MWProject_PPC_filecreator1061109567
- MWProject_PPC_filetype1095782476
- MWProject_PPC_size3840
- MWProject_PPC_minsize3840
- MWProject_PPC_stacksize64
- MWProject_PPC_flags22720
- MWProject_PPC_symfilename
- MWProject_PPC_rsrcname
- MWProject_PPC_rsrcheaderNative
- MWProject_PPC_rsrctype1061109567
- MWProject_PPC_rsrcid0
- MWProject_PPC_rsrcflags0
- MWProject_PPC_rsrcstore0
- MWProject_PPC_rsrcmerge0
-
-
- MWAssembler_PPC_auxheader0
- MWAssembler_PPC_symmodeMac
- MWAssembler_PPC_dialectPPC
- MWAssembler_PPC_prefixfile
- MWAssembler_PPC_typecheck0
- MWAssembler_PPC_warnings0
- MWAssembler_PPC_casesensitive0
-
-
- MWRez_Language_maxwidth80
- MWRez_Language_scriptRoman
- MWRez_Language_alignmentAlign1
- MWRez_Language_filtermodeFilterSkip
- MWRez_Language_suppresswarnings0
- MWRez_Language_escapecontrolchars1
- MWRez_Language_prefixname
- MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT'
-
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- console.stubs.c
- MacOS
- Text
- Debug
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- wx_CARBON_d.lib
- MacOS
- Library
- Debug
-
-
- Name
- MSL C.CARBON.Lib
- MacOS
- Library
- Debug
-
-
- Name
- wx_CARBON.rsrc
- MacOS
- Resource
- Debug
-
-
- Name
- tiffd.lib
- MacOS
- Library
- Debug
-
-
- Name
- jpeg.lib
- MacOS
- Library
- Debug
-
-
- Name
- png.lib
- MacOS
- Library
- Debug
-
-
- Name
- zlib.lib
- MacOS
- Library
- Debug
-
-
- Name
- toolbar.cpp
- MacOS
- Text
- Debug
-
-
- Name
- CarbonLib
- MacOS
- Library
- Debug
-
-
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
-
-
- Name
- console.stubs.c
- MacOS
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
-
-
- Name
- wx_CARBON_d.lib
- MacOS
-
-
- Name
- MSL C.CARBON.Lib
- MacOS
-
-
- Name
- wx_CARBON.rsrc
- MacOS
-
-
- Name
- tiffd.lib
- MacOS
-
-
- Name
- jpeg.lib
- MacOS
-
-
- Name
- png.lib
- MacOS
-
-
- Name
- zlib.lib
- MacOS
-
-
- Name
- toolbar.cpp
- MacOS
-
-
- Name
- CarbonLib
- MacOS
-
-
-
-
- Carbon Release
-
-
-
- UserSourceTrees
-
-
- CustomColor1
- Red0
- Green32767
- Blue0
-
- CustomColor2
- Red0
- Green32767
- Blue0
-
- CustomColor3
- Red0
- Green32767
- Blue0
-
- CustomColor4
- Red0
- Green32767
- Blue0
-
-
-
- AlwaysSearchUserPathstrue
- InterpretDOSAndUnixPathstrue
- UserSearchPaths
-
- SearchPath
- Path:
- PathFormatMacOS
- PathRootProject
-
- Recursivetrue
- HostFlagsAll
-
-
- SearchPath
- Path:::include:
- PathFormatMacOS
- PathRootProject
-
- Recursivefalse
- HostFlagsAll
-
-
- SearchPath
- Path:::lib:
- PathFormatMacOS
- PathRootProject
-
- Recursivetrue
- HostFlagsAll
-
-
- SystemSearchPaths
-
- SearchPath
- PathMSL
- PathFormatWindows
- PathRootCodeWarrior
-
- Recursivetrue
- HostFlagsAll
-
-
- SearchPath
- Path:MacOS Support:
- PathFormatMacOS
- PathRootCodeWarrior
-
- Recursivetrue
- HostFlagsAll
-
-
-
-
- LinkerMacOS PPC Linker
- PreLinker
- PostLinker
- TargetnameCarbon Release
- OutputDirectory
- Path:
- PathFormatMacOS
- PathRootProject
-
- SaveEntriesUsingRelativePathsfalse
-
-
- FileMappings
-
- FileTypeAPPL
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeAppl
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeMMLB
- FileExtension
- CompilerLib Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeMPLF
- FileExtension
- CompilerLib Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeMWCD
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeRSRC
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.c
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.c++
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cc
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cp
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.cpp
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.exp
- Compiler
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.h
- CompilerMW C/C++ PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMaketrue
-
-
- FileTypeTEXT
- FileExtension.pch
- CompilerMW C/C++ PPC
- Precompiletrue
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.pch++
- CompilerMW C/C++ PPC
- Precompiletrue
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeTEXT
- FileExtension.r
- CompilerRez
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypeXCOF
- FileExtension
- CompilerXCOFF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypedocu
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypersrc
- FileExtension
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileTypeshlb
- FileExtension
- CompilerPEF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileTypestub
- FileExtension
- CompilerPEF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileExtension.doc
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFilefalse
- IgnoredByMaketrue
-
-
- FileExtension.o
- CompilerXCOFF Import PPC
- Precompilefalse
- Launchablefalse
- ResourceFilefalse
- IgnoredByMakefalse
-
-
- FileExtension.ppob
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
- FileExtension.rsrc
- Compiler
- Precompilefalse
- Launchabletrue
- ResourceFiletrue
- IgnoredByMakefalse
-
-
-
-
- CacheModDatestrue
- ActivateBrowsertrue
- DumpBrowserInfofalse
- CacheSubprojectstrue
- UseThirdPartyDebuggerfalse
- DebuggerCommandLine
- Debugger Runtime
- 0002000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000
-
-
-
- LogSystemMessagestrue
- AutoTargetDLLsfalse
- StopAtWatchpointstrue
- PauseWhileRunningfalse
- PauseInterval5
- PauseUIFlags0
- AltExePath
- Path
- PathFormatGeneric
- PathRootAbsolute
-
- StopAtTempBPOnLaunchtrue
- CacheSymbolicstrue
- TempBPFunctionNamemain
- TempBPTypefalse
-
-
- MWFrontEnd_C_cplusplus0
- MWFrontEnd_C_checkprotos0
- MWFrontEnd_C_arm0
- MWFrontEnd_C_trigraphs0
- MWFrontEnd_C_onlystdkeywords0
- MWFrontEnd_C_enumsalwaysint0
- MWFrontEnd_C_mpwpointerstyle1
- MWFrontEnd_C_prefixname/wx/wx_cwc.h
- MWFrontEnd_C_ansistrict0
- MWFrontEnd_C_mpwcnewline1
- MWFrontEnd_C_wchar_type1
- MWFrontEnd_C_enableexceptions1
- MWFrontEnd_C_dontreusestrings0
- MWFrontEnd_C_poolstrings0
- MWFrontEnd_C_dontinline0
- MWFrontEnd_C_useRTTI1
- MWFrontEnd_C_multibyteaware0
- MWFrontEnd_C_unsignedchars1
- MWFrontEnd_C_autoinline0
- MWFrontEnd_C_booltruefalse1
- MWFrontEnd_C_direct_to_som0
- MWFrontEnd_C_som_env_check0
- MWFrontEnd_C_alwaysinline0
- MWFrontEnd_C_inlinelevel0
- MWFrontEnd_C_ecplusplus0
- MWFrontEnd_C_objective_c0
- MWFrontEnd_C_defer_codegen0
-
-
- MWWarning_C_warn_illpragma0
- MWWarning_C_warn_emptydecl0
- MWWarning_C_warn_possunwant0
- MWWarning_C_warn_unusedvar0
- MWWarning_C_warn_unusedarg0
- MWWarning_C_warn_extracomma0
- MWWarning_C_pedantic0
- MWWarning_C_warningerrors0
- MWWarning_C_warn_hidevirtual0
- MWWarning_C_warn_implicitconv0
- MWWarning_C_warn_notinlined0
- MWWarning_C_warn_structclass0
-
-
- MWMerge_MacOS_projectTypeApplication
- MWMerge_MacOS_outputNameMerge Out
- MWMerge_MacOS_outputCreator1061109567
- MWMerge_MacOS_outputType1095782476
- MWMerge_MacOS_suppressWarning0
- MWMerge_MacOS_copyFragments1
- MWMerge_MacOS_copyResources1
- MWMerge_MacOS_skipResources
-
- {Ð
- %#H
- %8*
-
-
-
- MWCodeGen_PPC_structalignmentPPC
- MWCodeGen_PPC_tracebacktablesNone
- MWCodeGen_PPC_processorGeneric
- MWCodeGen_PPC_readonlystrings0
- MWCodeGen_PPC_tocdata1
- MWCodeGen_PPC_profiler0
- MWCodeGen_PPC_fpcontract1
- MWCodeGen_PPC_schedule0
- MWCodeGen_PPC_peephole1
- MWCodeGen_PPC_processorspecific0
- MWCodeGen_PPC_altivec0
- MWCodeGen_PPC_vectortocdata0
- MWCodeGen_PPC_vrsave0
-
-
- MWDisassembler_PPC_showcode1
- MWDisassembler_PPC_extended1
- MWDisassembler_PPC_mix0
- MWDisassembler_PPC_nohex0
- MWDisassembler_PPC_showdata1
- MWDisassembler_PPC_showexceptions1
- MWDisassembler_PPC_showsym0
- MWDisassembler_PPC_shownames1
-
-
- GlobalOptimizer_PPC_optimizationlevelLevel0
- GlobalOptimizer_PPC_optforSpeed
-
-
- MWLinker_PPC_linksym1
- MWLinker_PPC_symfullpath1
- MWLinker_PPC_linkmap0
- MWLinker_PPC_nolinkwarnings0
- MWLinker_PPC_dontdeadstripinitcode0
- MWLinker_PPC_permitmultdefs0
- MWLinker_PPC_linkmodeFast
- MWLinker_PPC_initname
- MWLinker_PPC_mainname__start
- MWLinker_PPC_termname
- PPC Mach-O CodeGen
- 0001000001010000010000000001010101000000
-
- PPC Mach-O Linker
- 0001000000000100000100000000000000000000000000000000000000007374
- 6172740000000000000000000000000000000000000000000000000000000000
- 000000000000000000000000000000000000000000000000000000000000
-
- PPC Mach-O Target
- 0001000005612E6F757400000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 000000003F3F3F3F4D41504C0000004000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 00000000
-
-
-
- MWPEF_exportsNone
- MWPEF_libfolder0
- MWPEF_sortcodeNone
- MWPEF_expandbss0
- MWPEF_sharedata0
- MWPEF_olddefversion0
- MWPEF_oldimpversion0
- MWPEF_currentversion0
- MWPEF_fragmentname
- MWPEF_collapsereloads0
-
-
- MWProject_PPC_typeApplication
- MWProject_PPC_outfiletoolbar Carbon Release
- MWProject_PPC_filecreator1061109567
- MWProject_PPC_filetype1095782476
- MWProject_PPC_size3840
- MWProject_PPC_minsize3840
- MWProject_PPC_stacksize64
- MWProject_PPC_flags22720
- MWProject_PPC_symfilename
- MWProject_PPC_rsrcname
- MWProject_PPC_rsrcheaderNative
- MWProject_PPC_rsrctype1061109567
- MWProject_PPC_rsrcid0
- MWProject_PPC_rsrcflags0
- MWProject_PPC_rsrcstore0
- MWProject_PPC_rsrcmerge0
-
-
- MWAssembler_PPC_auxheader0
- MWAssembler_PPC_symmodeMac
- MWAssembler_PPC_dialectPPC
- MWAssembler_PPC_prefixfile
- MWAssembler_PPC_typecheck0
- MWAssembler_PPC_warnings0
- MWAssembler_PPC_casesensitive0
-
-
- MWRez_Language_maxwidth80
- MWRez_Language_scriptRoman
- MWRez_Language_alignmentAlign1
- MWRez_Language_filtermodeFilterSkip
- MWRez_Language_suppresswarnings0
- MWRez_Language_escapecontrolchars1
- MWRez_Language_prefixname
- MWRez_Language_filteredtypes'CODE' 'DATA' 'PICT'
-
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- console.stubs.c
- MacOS
- Text
-
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
- Library
- Debug
-
-
- Name
- MSL C.CARBON.Lib
- MacOS
- Library
-
-
-
- Name
- wx_CARBON.lib
- MacOS
- Library
-
-
-
- Name
- wx_CARBON.rsrc
- MacOS
- Resource
-
-
-
- Name
- tiff.lib
- MacOS
- Library
-
-
-
- Name
- jpeg.lib
- MacOS
- Library
-
-
-
- Name
- toolbar.cpp
- MacOS
- Text
-
-
-
- Name
- zlib.lib
- MacOS
- Library
-
-
-
- Name
- png.lib
- MacOS
- Library
-
-
-
- Name
- CarbonLib
- MacOS
- Library
-
-
-
-
-
- Name
- MSL C++.PPC.Lib
- MacOS
-
-
- Name
- console.stubs.c
- MacOS
-
-
- Name
- MSL RuntimePPC.Lib
- MacOS
-
-
- Name
- MSL C.CARBON.Lib
- MacOS
-
-
- Name
- wx_CARBON.lib
- MacOS
-
-
- Name
- wx_CARBON.rsrc
- MacOS
-
-
- Name
- tiff.lib
- MacOS
-
-
- Name
- jpeg.lib
- MacOS
-
-
- Name
- toolbar.cpp
- MacOS
-
-
- Name
- zlib.lib
- MacOS
-
-
- Name
- png.lib
- MacOS
-
-
- Name
- CarbonLib
- MacOS
-
-
-
-
-
-
- Classic Release
- Classic Debug
- Carbon Debug
- Carbon Release
-
-
-
-
- Classic Release
- Name
- toolbar.cpp
- MacOS
-
- wx
-
- Carbon Release
- Name
- wx_CARBON.lib
- MacOS
-
-
- Carbon Debug
- Name
- wx_CARBON_d.lib
- MacOS
-
-
- Carbon Debug
- Name
- wx_CARBON.rsrc
- MacOS
-
-
- Classic Release
- Name
- wx_PPC.lib
- MacOS
-
-
- Classic Debug
- Name
- wx_PPC_d.lib
- MacOS
-
-
- Classic Release
- Name
- wx_PPC.rsrc
- MacOS
-
-
- Classic Release
- Name
- tiff.lib
- MacOS
-
-
- Classic Release
- Name
- zlib.lib
- MacOS
-
-
- Classic Release
- Name
- png.lib
- MacOS
-
-
- Classic Debug
- Name
- tiffd.lib
- MacOS
-
-
- Classic Release
- Name
- jpeg.lib
- MacOS
-
-
- MSL ANSI Libraries
-
- Classic Release
- Name
- console.stubs.c
- MacOS
-
-
- Classic Release
- Name
- MSL RuntimePPC.Lib
- MacOS
-
-
- Classic Release
- Name
- MSL C++.PPC.Lib
- MacOS
-
-
- Classic Release
- Name
- MSL C.PPC.Lib
- MacOS
-
-
- Carbon Debug
- Name
- MSL C.CARBON.Lib
- MacOS
-
-
- Win32 SDK
-
- MacOS
- Carbon
-
- Carbon Debug
- Name
- CarbonLib
- MacOS
-
-
- Classic
-
- Classic Release
- Name
- AppearanceLib
- MacOS
-
-
- Classic Release
- Name
- ATSUnicodeLib
- MacOS
-
-
- Classic Release
- Name
- CarbonAccessors.o
- MacOS
-
-
- Classic Release
- Name
- ControlsLib
- MacOS
-
-
- Classic Release
- Name
- CursorDevicesGlue.o
- MacOS
-
-
- Classic Release
- Name
- DialogsLib
- MacOS
-
-
- Classic Release
- Name
- DragLib
- MacOS
-
-
- Classic Release
- Name
- InterfaceLib
- MacOS
-
-
- Classic Release
- Name
- InternetConfigLib
- MacOS
-
-
- Classic Release
- Name
- WindowsLib
- MacOS
-
-
- Classic Release
- Name
- MathLib
- MacOS
-
-
- Classic Release
- Name
- MenusLib
- MacOS
-
-
- Classic Release
- Name
- NavigationLib
- MacOS
-
-
- Classic Release
- Name
- OpenTptAppleTalkLib
- MacOS
-
-
- Classic Release
- Name
- OpenTptATalkPPC.o
- MacOS
-
-
- Classic Release
- Name
- OpenTptInetPPC.o
- MacOS
-
-
- Classic Release
- Name
- OpenTptInternetLib
- MacOS
-
-
- Classic Release
- Name
- OpenTransportLib
- MacOS
-
-
- Classic Release
- Name
- OpenTransportAppPPC.o
- MacOS
-
-
- Classic Release
- Name
- PLStringFuncsPPC.lib
- MacOS
-
-
- Classic Release
- Name
- TextEncodingConverter
- MacOS
-
-
- Classic Release
- Name
- Textension
- MacOS
-
-
- Classic Release
- Name
- ThreadsLib
- MacOS
-
-
- Classic Release
- Name
- UnicodeConverter
- MacOS
-
-
-
-
-
-
+ {
\ No newline at end of file
diff --git a/samples/treectrl/treetest.dsp b/samples/treectrl/treetest.dsp
index 7d2fdbca7c..550e680836 100644
--- a/samples/treectrl/treetest.dsp
+++ b/samples/treectrl/treetest.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "treetest - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "treetest - Win32 Release"
diff --git a/samples/treelay/treelay.dsp b/samples/treelay/treelay.dsp
index 8051ab49ad..116714a057 100644
--- a/samples/treelay/treelay.dsp
+++ b/samples/treelay/treelay.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "treelay - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "treelay - Win32 Release"
diff --git a/samples/typetest/typetest.dsp b/samples/typetest/typetest.dsp
index 6af9d7602e..af56d537e5 100644
--- a/samples/typetest/typetest.dsp
+++ b/samples/typetest/typetest.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "typetest - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "typetest - Win32 Release"
diff --git a/samples/validate/validate.dsp b/samples/validate/validate.dsp
index 13e758ed0a..02f94eaa41 100644
--- a/samples/validate/validate.dsp
+++ b/samples/validate/validate.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "validate - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "validate - Win32 Release"
diff --git a/samples/widgets/widgets.dsp b/samples/widgets/widgets.dsp
index b7a51f6a7e..0e43425ddd 100644
--- a/samples/widgets/widgets.dsp
+++ b/samples/widgets/widgets.dsp
@@ -55,7 +55,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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\wxmsw233.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 ..\..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "widgets - Win32 Debug DLL"
@@ -81,7 +81,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 comctl32.lib rpcrt4.lib wsock32.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 ..\..\lib\wxmsw233d.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 ..\..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "widgets - Win32 Release"
diff --git a/samples/wizard/wizard.dsp b/samples/wizard/wizard.dsp
index f25939a17d..655ea8643e 100644
--- a/samples/wizard/wizard.dsp
+++ b/samples/wizard/wizard.dsp
@@ -54,7 +54,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw233.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 /nologo /subsystem:windows /machine:I386 ..\..\lib\wxmsw234.lib
!ELSEIF "$(CFG)" == "wizard - Win32 Debug DLL"
@@ -80,7 +80,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 comctl32.lib rpcrt4.lib wsock32.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw233d.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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept ..\..\lib\wxmsw234d.lib
!ELSEIF "$(CFG)" == "wizard - Win32 Release"
diff --git a/src/makeg95.env b/src/makeg95.env
index 4e4bccde08..ce231cc18c 100644
--- a/src/makeg95.env
+++ b/src/makeg95.env
@@ -25,7 +25,7 @@ MINGW32VERSION=3.0
#OSTYPE=msys
# If building DLL, the version
-WXVERSION=233
+WXVERSION=234
ifndef UNICODE
UNICODE=0
diff --git a/src/makevc.env b/src/makevc.env
index 15426ba7de..387ef57a73 100644
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -12,7 +12,7 @@
RM= erase
!endif
-WXVERSION=233
+WXVERSION=234
# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+
WIN95=1
diff --git a/src/wxWindows.dsp b/src/wxWindows.dsp
index c74aa6bba6..163db8eb74 100644
--- a/src/wxWindows.dsp
+++ b/src/wxWindows.dsp
@@ -58,8 +58,8 @@ 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw233u.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw233u.dll"
+# 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw234u.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw234u.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug Unicode DLL"
@@ -84,8 +84,8 @@ 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233ud.dll"
+# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw234ud.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw234ud.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release Unicode"
@@ -156,8 +156,8 @@ 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw233.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw233.dll"
+# 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 winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /dll /machine:I386 /out:"../lib/wxmsw234.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpeg.lib ..\lib\tiff.lib ..\lib\png.lib ..\lib\regex.lib ..\lib\zlib.lib /nologo /version:2.3 /dll /machine:I386 /out:"../lib/wxmsw234.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Debug DLL"
@@ -182,8 +182,8 @@ 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.dll"
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw233d.dll"
+# 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 winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw234d.dll"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib advapi32.lib comdlg32.lib shell32.lib ole32.lib oleaut32.lib odbc32.lib uuid.lib rpcrt4.lib comctl32.lib wsock32.lib winmm.lib ..\lib\jpegd.lib ..\lib\tiffd.lib ..\lib\pngd.lib ..\lib\regexd.lib ..\lib\zlibd.lib /nologo /version:2.3 /dll /debug /machine:I386 /pdbtype:sept /out:"../lib/wxmsw234d.dll"
!ELSEIF "$(CFG)" == "wxWindows - Win32 Release"
diff --git a/utils/HelpGen/src/HelpGenVC.dsp b/utils/HelpGen/src/HelpGenVC.dsp
index 447a4b5833..835014deb9 100644
--- a/utils/HelpGen/src/HelpGenVC.dsp
+++ b/utils/HelpGen/src/HelpGenVC.dsp
@@ -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 wxmsw233d.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 wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/helpgen.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
!ELSEIF "$(CFG)" == "HelpGenVC - Win32 Release DLL"
@@ -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 wxmsw233.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 wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/helpgen.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
!ENDIF
diff --git a/utils/dialoged/src/DialogEdVC.dsp b/utils/dialoged/src/DialogEdVC.dsp
index b91aa17a67..2f0e844558 100644
--- a/utils/dialoged/src/DialogEdVC.dsp
+++ b/utils/dialoged/src/DialogEdVC.dsp
@@ -108,7 +108,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 wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dialoged.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 wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/dialoged.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
!ELSEIF "$(CFG)" == "DialogEdVC - Win32 Release DLL"
@@ -135,7 +135,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 wxmsw233.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dialoged.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 wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/dialoged.exe" /libpath:"../../../lib" /libpath:"../../../contrib/lib"
!ENDIF
diff --git a/utils/helpview/src/helpview.dsp b/utils/helpview/src/helpview.dsp
index 9300b9df44..1cd5f9bfad 100644
--- a/utils/helpview/src/helpview.dsp
+++ b/utils/helpview/src/helpview.dsp
@@ -55,7 +55,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 comctl32.lib rpcrt4.lib wsock32.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 ../../..\lib\wxmsw233.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 ../../..\lib\wxmsw234.lib /nologo /subsystem:windows /machine:I386
!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Debug DLL"
@@ -81,7 +81,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 comctl32.lib rpcrt4.lib wsock32.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 ../../..\lib\wxmsw233d.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 ../../..\lib\wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
!ELSEIF "$(CFG)" == "htmlhelpview - Win32 Release"
diff --git a/utils/tex2rtf/src/Tex2RTFVC.dsp b/utils/tex2rtf/src/Tex2RTFVC.dsp
index 18b448e46b..6dac0843bf 100644
--- a/utils/tex2rtf/src/Tex2RTFVC.dsp
+++ b/utils/tex2rtf/src/Tex2RTFVC.dsp
@@ -108,7 +108,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 wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/tex2rtf.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 wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/tex2rtf.exe" /pdbtype:sept /libpath:"../../../lib" /libpath:"../../../contrib/lib"
!ELSEIF "$(CFG)" == "Tex2RTFVC - Win32 Release DLL"
diff --git a/utils/wxrc/wxRcVC.dsp b/utils/wxrc/wxRcVC.dsp
index 24ae29e1e7..4d62151234 100644
--- a/utils/wxrc/wxRcVC.dsp
+++ b/utils/wxrc/wxRcVC.dsp
@@ -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 wxmsw233d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrc.exe" /pdbtype:sept /libpath:"..\..\..\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 wxmsw234d.lib /nologo /subsystem:windows /debug /machine:I386 /nodefaultlib:"libcd.lib" /nodefaultlib:"libcid.lib" /out:"DebugDLL/wxrc.exe" /pdbtype:sept /libpath:"..\..\..\lib"
!ELSEIF "$(CFG)" == "wxRcVC - Win32 Release DLL"
@@ -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 wxmsw233.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrc.exe" /libpath:"..\..\..\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 wxmsw234.lib /nologo /subsystem:windows /machine:I386 /nodefaultlib:"libc.lib" /nodefaultlib:"libci.lib" /out:"ReleaseDLL/wxrc.exe" /libpath:"..\..\..\lib"
!ENDIF