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.

1 files changed, 10 insertions, 25 deletions

diff --git a/PCbuild/python16.dsp b/PCbuild/python16.dsp
index b04bcaf..20987d4 100644
--- a/PCbuild/python16.dsp
+++ b/PCbuild/python16.dsp
@@ -39,7 +39,7 @@ CFG=python16 - Win32 Alpha Debug
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "."

-# PROP Intermediate_Dir "x86-temp-release"

+# PROP Intermediate_Dir "x86-temp-release\python16"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 F90=df.exe

@@ -57,7 +57,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 /nologo /subsystem:windows /dll /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 largeint.lib winmm.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /libpath:"Release"

+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc"

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "python16 - Win32 Debug"

@@ -70,7 +70,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

-# PROP Intermediate_Dir "x86-temp-debug"

+# PROP Intermediate_Dir "x86-temp-debug\python16"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 F90=df.exe

@@ -88,7 +88,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 /nologo /subsystem:windows /dll /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 largeint.lib winmm.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python16_d.dll" /pdbtype:sept /libpath:"Debug"

+# 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

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Debug"

@@ -102,7 +102,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 1

 # PROP Output_Dir "."

-# PROP Intermediate_Dir "alpha-temp-debug"

+# PROP Intermediate_Dir "alpha-temp-debug\python16"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

@@ -118,9 +118,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# 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"

+# 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

 # SUBTRACT BASE LINK32 /pdb:none

-# 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"

+# 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

 # SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Release"

@@ -134,7 +134,7 @@ LINK32=link.exe
 # PROP Use_MFC 0

 # PROP Use_Debug_Libraries 0

 # PROP Output_Dir "."

-# PROP Intermediate_Dir "alpha-temp-release"

+# PROP Intermediate_Dir "alpha-temp-release\python16"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

 CPP=cl.exe

@@ -150,9 +150,9 @@ BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo

 # ADD BSC32 /nologo

 LINK32=link.exe

-# 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"

+# 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"

 # SUBTRACT BASE LINK32 /pdb:none

-# 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"

+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib /nologo /base:"0x1e100000" /subsystem:windows /dll /debug /machine:ALPHA /nodefaultlib:"libc"

 # SUBTRACT LINK32 /pdb:none

 

 !ENDIF 

@@ -1643,21 +1643,6 @@ SOURCE=..\Objects\unicodeobject.c
 # End Source File

 # Begin Source File

 

-SOURCE=..\PC\winsound.c

-

-!IF  "$(CFG)" == "python16 - Win32 Release"

-

-!ELSEIF  "$(CFG)" == "python16 - Win32 Debug"

-

-!ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Debug"

-

-!ELSEIF  "$(CFG)" == "python16 - Win32 Alpha Release"

-

-!ENDIF 

-

-# End Source File

-# Begin Source File

-

 SOURCE=..\Modules\yuvconvert.c

 

 !IF  "$(CFG)" == "python16 - Win32 Release"