Mark Hammond:

* Temp directory for all projects are now specific to the project
(rather than common as before).  This avoids any conflicts with
debug symbols or common file names etc.
NOTE: You should manually delete your existing build directory after
applying this patch, as the MSVC "clean" command will now only clean
the new temporary directories - not the existing common temp
directory.

* Base address for all extension modules updated. PC\dllbase_nt.txt
also updated.  Erroneous "libpath" directory removed for all
projects.

* winsound module moved from a builtin module to an extension
module.  This was done primarily to avoid Python16.dll needing to
pull in winmm.dll.  Really dumb test added for winsound - but if
nothing else it ensures the module imports.

diff --git a/PCbuild/_socket.dsp b/PCbuild/_socket.dsp
index a5068fba53cf250bc3391245ed8a7ddc27f5efa1..4db8a970fdecf8d8a860d46a66423a3389b90a78 100755 (executable)
--- a/PCbuild/_socket.dsp
+++ b/PCbuild/_socket.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\_socket"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./_socket.pyd" /libpath:"Release" /export:init_socket\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_socket.pyd" /export:init_socket\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "_socket - Win32 Debug"\r
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\_socket"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./_socket_d.pyd" /pdbtype:sept /libpath:"Debug" /export:init_socket\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1e1D0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_socket_d.pyd" /pdbtype:sept /export:init_socket\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/_sre.dsp b/PCbuild/_sre.dsp
index 9e73f1937c54f9a98df8fa2c3e2031eac161ebb9..5db00147552e50067fa303054a3023c4668f3e9f 100755 (executable)
--- a/PCbuild/_sre.dsp
+++ b/PCbuild/_sre.dsp
@@ -39,7 +39,7 @@ CFG=_sre - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\_sre"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./_sre.pyd" /libpath:"Release" /export:init_sre\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_sre.pyd" /export:init_sre\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "_sre - Win32 Debug"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\_sre"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./_sre_d.pyd" /pdbtype:sept /libpath:"Debug" /export:init_sre\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e1F0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_sre_d.pyd" /pdbtype:sept /export:init_sre\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "_sre - Win32 Alpha Debug"\r
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\_sre"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_sre_d.pyd" /pdbtype:sept /libpath:"Debug" /export:init_sre\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_sre_d.pyd" /pdbtype:sept /export:init_sre\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_sre_d.pyd" /pdbtype:sept /libpath:"Debug" /export:init_sre\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e1F0000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/_sre_d.pyd" /pdbtype:sept /export:init_sre\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "_sre - Win32 Alpha Release"\r
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\sre"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -150,9 +150,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_sre.pyd" /libpath:"Release" /export:init_sre\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./_sre.pyd" /export:init_sre\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_sre.pyd" /libpath:"Release" /export:init_sre\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e1F0000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/_sre.pyd" /export:init_sre\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/_tkinter.dsp b/PCbuild/_tkinter.dsp
index 4440739afe54e6542a22bfd2a21abe5b6e843413..f0bb1f5fae5964c48d1ee2a6c60c714dc173c78e 100644 (file)
--- a/PCbuild/_tkinter.dsp
+++ b/PCbuild/_tkinter.dsp
@@ -40,7 +40,7 @@ CFG=_tkinter - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\_tkinter"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\_tkinter"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -103,7 +103,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\_tkinter"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\_tkinter"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r

diff --git a/PCbuild/bsddb.dsp b/PCbuild/bsddb.dsp
index 744b6ed29c66bc4a357bb40b986759d21f6d7d98..bac1f4bcca58dd974a78472236ebf44f10704105 100644 (file)
--- a/PCbuild/bsddb.dsp
+++ b/PCbuild/bsddb.dsp
@@ -39,7 +39,7 @@ CFG=bsddb - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\bsddb"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"./bsddb.pyd" /libpath:"Release" /export:initbsddb\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /out:"./bsddb.pyd" /export:initbsddb\r
 # SUBTRACT LINK32 /verbose /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "bsddb - Win32 Debug"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\bsddb"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\bsddb\port\win32\db.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /export:initbsddb\r
 # SUBTRACT LINK32 /verbose /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Debug"\r
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\bsddb"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb\r
+# ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"./bsddb_d.pyd" /pdbtype:sept /export:initbsddb\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"alpha-temp-debug\bsddb_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initbsddb\r
+# ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"MSVCRT" /out:"alpha-temp-debug\bsddb_d.pyd" /pdbtype:sept /export:initbsddb\r
 # SUBTRACT LINK32 /verbose /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "bsddb - Win32 Alpha Release"\r
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\bsddb"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -150,9 +150,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"./bsddb.pyd" /libpath:"Release" /export:initbsddb\r
+# ADD BASE LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"./bsddb.pyd" /export:initbsddb\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release\bsddb.pyd" /libpath:"Release" /export:initbsddb\r
+# ADD LINK32 ..\..\bsddb\port\win32\db.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release\bsddb.pyd" /export:initbsddb\r
 # SUBTRACT LINK32 /verbose /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/mmap.dsp b/PCbuild/mmap.dsp
index f902475ffbfdcc3a95d767abd2977e03e0d40235..0f518ee3386272dd7e7dac3891ce978c4fdd5a36 100644 (file)
--- a/PCbuild/mmap.dsp
+++ b/PCbuild/mmap.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release\winreg"\r
+# PROP Intermediate_Dir "x86-temp-release\mmap"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"./mmap.pyd"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"1e1F0000" /dll /machine:I386 /out:"./mmap.pyd"\r
 \r
 !ELSEIF  "$(CFG)" == "mmap - Win32 Debug"\r
 \r
@@ -81,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"./mmap_d.pyd" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"1e1F0000" /dll /debug /machine:I386 /out:"./mmap_d.pyd" /pdbtype:sept\r
 \r
 !ENDIF \r
 \r

diff --git a/PCbuild/parser.dsp b/PCbuild/parser.dsp
index 17059ff5b7367daeaeeb572e85d467731a7992b8..d519d8ee0465453ca370ef088d20d89560c76bd0 100644 (file)
--- a/PCbuild/parser.dsp
+++ b/PCbuild/parser.dsp
@@ -39,7 +39,7 @@ CFG=parser - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\parser"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser.pyd" /libpath:"Release" /export:initparser\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1eA00000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser.pyd" /export:initparser\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "parser - Win32 Debug"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\parser"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1eA00000" /subsystem:windows /dll /debug /machine:I386 /out:"./parser_d.pyd" /pdbtype:sept /export:initparser\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Debug"\r
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\parser"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser_d.pyd" /pdbtype:sept /export:initparser\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/parser_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initparser\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1eA00000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/parser_d.pyd" /pdbtype:sept /export:initparser\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "parser - Win32 Alpha Release"\r
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\parser"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -150,9 +150,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser.pyd" /libpath:"Release" /export:initparser\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./parser.pyd" /export:initparser\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/parser.pyd" /libpath:"Release" /export:initparser\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1eA00000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/parser.pyd" /export:initparser\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/pyexpat.dsp b/PCbuild/pyexpat.dsp
index bb79d589a6a13f56c2d0e68391cc003327354fa0..1754737793072d12a31fbb7799bdea21bf88c406 100755 (executable)
--- a/PCbuild/pyexpat.dsp
+++ b/PCbuild/pyexpat.dsp
@@ -39,7 +39,7 @@ CFG=pyexpat - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\pyexpat"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat.pyd" /libpath:"Release" /export:initpyexpat\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat.pyd" /export:initpyexpat\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pyexpat - Win32 Debug"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\pyexpat"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initpyexpat\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:I386 /out:"./pyexpat_d.pyd" /pdbtype:sept /export:initpyexpat\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pyexpat - Win32 Alpha Debug"\r
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\pyexpat"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./pyexpat_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initpyexpat\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./pyexpat_d.pyd" /pdbtype:sept /export:initpyexpat\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/pyexpat_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initpyexpat\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-debug/pyexpat_d.pyd" /pdbtype:sept /export:initpyexpat\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pyexpat - Win32 Alpha Release"\r
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\pyexpat"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -150,9 +150,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./pyexpat.pyd" /libpath:"Release" /export:initpyexpat\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"./pyexpat.pyd" /export:initpyexpat\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/pyexpat.pyd" /libpath:"Release" /export:initpyexpat\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1D100000" /subsystem:windows /dll /debug /machine:ALPHA /out:"alpha-temp-release/pyexpat.pyd" /export:initpyexpat\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/python.dsp b/PCbuild/python.dsp
index 6e007a09a1c0ec426b8e8f008c8cde47e6b85f28..56042ead1eb65f5876f4fb3ce4e35d914750ed8b 100644 (file)
--- a/PCbuild/python.dsp
+++ b/PCbuild/python.dsp
@@ -39,7 +39,7 @@ CFG=python - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\python"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -53,7 +53,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:console /machine:I386\r
-# ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /libpath:"Release"\r
+# ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386\r
 \r
 !ELSEIF  "$(CFG)" == "python - Win32 Debug"\r
 \r
@@ -65,7 +65,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\python"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -79,7 +79,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"\r
+# ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept\r
 \r
 !ELSEIF  "$(CFG)" == "python - Win32 Alpha Debug"\r
 \r
@@ -92,7 +92,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\python"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -105,8 +105,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept /libpath:"Debug"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /subsystem:console /debug /machine:ALPHA /out:"./python_d.exe" /pdbtype:sept\r
 \r
 !ELSEIF  "$(CFG)" == "python - Win32 Alpha Release"\r
 \r
@@ -119,7 +119,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\python"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -132,8 +132,8 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release"\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /subsystem:console /debug /machine:ALPHA /libpath:"Release"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /subsystem:console /debug /machine:ALPHA\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /subsystem:console /debug /machine:ALPHA\r
 \r
 !ENDIF \r
 \r

diff --git a/PCbuild/python16.dsp b/PCbuild/python16.dsp
index b04bcaf1520ce984de6e159b3ab4f61a14c02513..20987d4152497ad5aefe746569111ad6ec75b666 100644 (file)
--- a/PCbuild/python16.dsp
+++ b/PCbuild/python16.dsp
@@ -39,7 +39,7 @@ CFG=python16 - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\python16"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -57,7 +57,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib largeint.lib winmm.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /libpath:"Release"\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "python16 - Win32 Debug"\r
@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\python16"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -88,7 +88,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib largeint.lib winmm.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept /libpath:"Debug"\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Debug"\r
@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\python16"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept /libpath:"Debug"\r
+# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept /libpath:"Debug"\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Release"\r
@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\python16"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -150,9 +150,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /libpath:"Release"\r
+# ADD BASE LINK32 wsock32.lib largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc"\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 largeint.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc" /libpath:"Release"\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
@@ -1643,21 +1643,6 @@ SOURCE=..\Objects\unicodeobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\PC\winsound.c\r
-\r
-!IF  "$(CFG)" == "python16 - Win32 Release"\r
-\r
-!ELSEIF  "$(CFG)" == "python16 - Win32 Debug"\r
-\r
-!ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Debug"\r
-\r
-!ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Release"\r
-\r
-!ENDIF \r
-\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\Modules\yuvconvert.c\r
 \r
 !IF  "$(CFG)" == "python16 - Win32 Release"\r

diff --git a/PCbuild/pythonw.dsp b/PCbuild/pythonw.dsp
index b39cde88544b6179b397695a058183938664963f..856648fee76f58392f57d2f6f809403e14c44256 100644 (file)
--- a/PCbuild/pythonw.dsp
+++ b/PCbuild/pythonw.dsp
@@ -39,7 +39,7 @@ CFG=pythonw - Win32 Alpha Debug
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\pythonw"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -56,7 +56,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /libpath:"Release"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:I386\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythonw - Win32 Debug"\r
@@ -69,7 +69,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\pythonw"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -86,7 +86,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:I386 /out:"./pythonw_d.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Debug"\r
@@ -100,7 +100,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-debug"\r
+# PROP Intermediate_Dir "alpha-temp-debug\pythonw"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -116,9 +116,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept /libpath:"Debug"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /out:"./pythonw_d.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythonw - Win32 Alpha Release"\r
@@ -132,7 +132,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "alpha-temp-release"\r
+# PROP Intermediate_Dir "alpha-temp-release\pythonw"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 CPP=cl.exe\r
@@ -148,9 +148,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo\r
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release"\r
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA\r
 # SUBTRACT BASE LINK32 /pdb:none\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA /libpath:"Release"\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib wsock32.lib /nologo /base:"0x1e190000" /subsystem:windows /debug /machine:ALPHA\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/select.dsp b/PCbuild/select.dsp
index a386d37e7887044f25235b20ce85cfcb56c1cfbd..4cb9e9221c0a852fcf575e9a1443dbfff0203a24 100755 (executable)
--- a/PCbuild/select.dsp
+++ b/PCbuild/select.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\select"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./select.pyd" /libpath:"Release" /export:initselect\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./select.pyd" /export:initselect\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "select - Win32 Debug"\r
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\select"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc msvcrt" /out:"./select_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initselect\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /base:"0x1D110000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /nodefaultlib:"msvcrt" /out:"./select_d.pyd" /pdbtype:sept /export:initselect\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/unicodedata.dsp b/PCbuild/unicodedata.dsp
index 4c8db6c6d5262951100f5f001ba8fca43258d580..ec969b321bfa70a2f543261f4a4a5089f9a877ce 100755 (executable)
--- a/PCbuild/unicodedata.dsp
+++ b/PCbuild/unicodedata.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release\winreg"\r
+# PROP Intermediate_Dir "x86-temp-release\unicodedata"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /out:"./unicodedata.pyd" /export:initunicodedata\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D120000" /dll /machine:I386 /out:"./unicodedata.pyd" /export:initunicodedata\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "unicodedata - Win32 Debug"\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /out:"./unicodedata_d.pyd" /pdbtype:sept /export:initunicodedata\r
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /base:"0x1D120000" /dll /debug /machine:I386 /out:"./unicodedata_d.pyd" /pdbtype:sept /export:initunicodedata\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r

diff --git a/PCbuild/winsound.dsp b/PCbuild/winsound.dsp
new file mode 100644 (file)
index 0000000..5f2b407
--- /dev/null
+++ b/PCbuild/winsound.dsp
@@ -0,0 +1,99 @@
+# Microsoft Developer Studio Project File - Name="winsound" - Package Owner=<4>\r
+# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
+# ** DO NOT EDIT **\r
+\r
+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
+\r
+CFG=winsound - Win32 Debug\r
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
+!MESSAGE use the Export Makefile command and run\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "winsound.mak".\r
+!MESSAGE \r
+!MESSAGE You can specify a configuration when running NMAKE\r
+!MESSAGE by defining the macro CFG on the command line. For example:\r
+!MESSAGE \r
+!MESSAGE NMAKE /f "winsound.mak" CFG="winsound - Win32 Debug"\r
+!MESSAGE \r
+!MESSAGE Possible choices for configuration are:\r
+!MESSAGE \r
+!MESSAGE "winsound - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE "winsound - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
+!MESSAGE \r
+\r
+# Begin Project\r
+# PROP AllowPerConfigDependencies 0\r
+# PROP Scc_ProjName ""\r
+# PROP Scc_LocalPath ""\r
+CPP=cl.exe\r
+MTL=midl.exe\r
+RSC=rc.exe\r
+\r
+!IF  "$(CFG)" == "winsound - Win32 Release"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 0\r
+# PROP BASE Output_Dir "Release"\r
+# PROP BASE Intermediate_Dir "Release"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 0\r
+# PROP Output_Dir "."\r
+# PROP Intermediate_Dir "x86-temp-release\winsound"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+F90=df.exe\r
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /c\r
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0xc09 /d "NDEBUG"\r
+# ADD RSC /l 0xc09 /d "NDEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# 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 /nologo /dll /machine:I386\r
+# ADD LINK32 kernel32.lib winmm.lib /nologo /base:"0x1D130000" /dll /machine:I386 /out:"./winsound.pyd" /export:initwinsound\r
+# SUBTRACT LINK32 /pdb:none\r
+\r
+!ELSEIF  "$(CFG)" == "winsound - Win32 Debug"\r
+\r
+# PROP BASE Use_MFC 0\r
+# PROP BASE Use_Debug_Libraries 1\r
+# PROP BASE Output_Dir "Debug"\r
+# PROP BASE Intermediate_Dir "Debug"\r
+# PROP BASE Target_Dir ""\r
+# PROP Use_MFC 0\r
+# PROP Use_Debug_Libraries 1\r
+# PROP Output_Dir "."\r
+# PROP Intermediate_Dir "x86-temp-debug\winsound"\r
+# PROP Ignore_Export_Lib 0\r
+# PROP Target_Dir ""\r
+F90=df.exe\r
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /GZ /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "WINSOUND_EXPORTS" /YX /FD /GZ /c\r
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
+# ADD BASE RSC /l 0xc09 /d "_DEBUG"\r
+# ADD RSC /l 0xc09 /d "_DEBUG"\r
+BSC32=bscmake.exe\r
+# ADD BASE BSC32 /nologo\r
+# ADD BSC32 /nologo\r
+LINK32=link.exe\r
+# 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 /nologo /dll /debug /machine:I386 /pdbtype:sept\r
+# ADD LINK32 kernel32.lib winmm.lib /nologo /base:"0x1D130000" /dll /debug /machine:I386 /out:"./winsound_d.pyd" /pdbtype:sept /export:initwinsound\r
+# SUBTRACT LINK32 /pdb:none\r
+\r
+!ENDIF \r
+\r
+# Begin Target\r
+\r
+# Name "winsound - Win32 Release"\r
+# Name "winsound - Win32 Debug"\r
+# Begin Source File\r
+\r
+SOURCE=..\PC\winsound.c\r
+# End Source File\r
+# End Target\r
+# End Project\r

diff --git a/PCbuild/zlib.dsp b/PCbuild/zlib.dsp
index 559be91caccfabf6b9f43d22cf68a10fe75878f5..3355d379c879d8d5858b8aae3c1d13b67a31b530 100644 (file)
--- a/PCbuild/zlib.dsp
+++ b/PCbuild/zlib.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 0\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release"\r
+# PROP Intermediate_Dir "x86-temp-release\zlib"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /libpath:"Release" /export:initzlib\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./zlib.pyd" /export:initzlib\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "zlib - Win32 Debug"\r
@@ -67,7 +67,7 @@ LINK32=link.exe
 # PROP Use_MFC 0\r
 # PROP Use_Debug_Libraries 1\r
 # PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug"\r
+# PROP Intermediate_Dir "x86-temp-debug\zlib"\r
 # PROP Ignore_Export_Lib 0\r
 # PROP Target_Dir ""\r
 F90=df.exe\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # 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 /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc msvcrt" /out:"./zlib_d.pyd" /pdbtype:sept /libpath:"Debug" /export:initzlib\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\zlib113dll\static32\zlibstat.lib /nologo /base:"0x1e1B0000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc msvcrt" /out:"./zlib_d.pyd" /pdbtype:sept /export:initzlib\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r