summaryrefslogtreecommitdiffstats
path: root/PCbuild/_socket.dsp
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2000-04-21 21:26:08 (GMT)
committerGuido van Rossum <guido@python.org>2000-04-21 21:26:08 (GMT)
commit7053b8a42219f7829dab3ec088b1eaa1547edb07 (patch)
tree97142eb0686785334d23fdb466e5d67a07d006da /PCbuild/_socket.dsp
parent25826c93c4cf1fcac537e6cded5ce986c751134e (diff)
downloadcpython-7053b8a42219f7829dab3ec088b1eaa1547edb07.zip
cpython-7053b8a42219f7829dab3ec088b1eaa1547edb07.tar.gz
cpython-7053b8a42219f7829dab3ec088b1eaa1547edb07.tar.bz2
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.
Diffstat (limited to 'PCbuild/_socket.dsp')
-rwxr-xr-xPCbuild/_socket.dsp8
1 files changed, 4 insertions, 4 deletions
diff --git a/PCbuild/_socket.dsp b/PCbuild/_socket.dsp
index a5068fb..4db8a97 100755
--- a/PCbuild/_socket.dsp
+++ b/PCbuild/_socket.dsp
@@ -39,7 +39,7 @@ RSC=rc.exe
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
-# PROP Intermediate_Dir "x86-temp-release"
+# PROP Intermediate_Dir "x86-temp-release\_socket"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.exe
@@ -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 /nologo /subsystem:windows /dll /machine:I386
-# 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
+# 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
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_socket - Win32 Debug"
@@ -67,7 +67,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\_socket"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.exe
@@ -82,7 +82,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 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
+# 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
# SUBTRACT LINK32 /pdb:none
!ENDIF