diff options
author | Christian Heimes <christian@cheimes.de> | 2008-12-03 18:35:13 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2008-12-03 18:35:13 (GMT) |
commit | fd44062a7fdd489d409a18e16064c5824cb933d3 (patch) | |
tree | bbfa6434b1f6240d20a0834f77bf24f029e6da3c /PC | |
parent | 70e5cabfdcdd5da131d58baa6e13bf87262d89a3 (diff) | |
download | cpython-fd44062a7fdd489d409a18e16064c5824cb933d3.zip cpython-fd44062a7fdd489d409a18e16064c5824cb933d3.tar.gz cpython-fd44062a7fdd489d409a18e16064c5824cb933d3.tar.bz2 |
More 3.0 -> 3.1 transistions
Diffstat (limited to 'PC')
-rw-r--r-- | PC/VC6/pythoncore.dsp | 4 | ||||
-rw-r--r-- | PC/VC6/readme.txt | 4 | ||||
-rw-r--r-- | PC/VS7.1/pythoncore.vcproj | 24 | ||||
-rw-r--r-- | PC/VS8.0/pyproject.vsprops | 2 |
4 files changed, 17 insertions, 17 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 2b702ad..732201a 100644 --- a/PC/VC6/pythoncore.dsp +++ b/PC/VC6/pythoncore.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 /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python30.dll"
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python31.dll"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "pythoncore - Win32 Debug"
@@ -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 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python30_d.dll" /pdbtype:sept
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python31_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt index fed79d6..f3d74ad 100644 --- a/PC/VC6/readme.txt +++ b/PC/VC6/readme.txt @@ -13,7 +13,7 @@ and build the projects. The proper order to build subprojects: 1) pythoncore (this builds the main Python DLL and library files, - python30.{dll, lib} in Release mode) + python31.{dll, lib} in Release mode) 2) python (this builds the main Python executable, python.exe in Release mode) @@ -24,7 +24,7 @@ The proper order to build subprojects: to the subsystems they implement; see SUBPROJECTS below) When using the Debug setting, the output files have a _d added to -their name: python30_d.dll, python_d.exe, pyexpat_d.pyd, and so on. +their name: python31_d.dll, python_d.exe, pyexpat_d.pyd, and so on. SUBPROJECTS ----------- diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj index 9d2e4ca..1d977d3 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -39,15 +39,15 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" + OutputFile="./python31.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30.pdb" + ProgramDatabaseFile=".\./python31.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python30.lib" + ImportLibrary=".\./python31.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -99,15 +99,15 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30_d.dll" + OutputFile="./python31_d.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30_d.pdb" + ProgramDatabaseFile=".\./python31_d.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python30_d.lib" + ImportLibrary=".\./python31_d.lib" TargetMachine="1"/> <Tool Name="VCMIDLTool"/> @@ -166,15 +166,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:IA64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" + OutputFile="./python31.dll" LinkIncremental="1" SuppressStartupBanner="FALSE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30.pdb" + ProgramDatabaseFile=".\./python31.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python30.lib" + ImportLibrary=".\./python31.lib" TargetMachine="0"/> <Tool Name="VCMIDLTool"/> @@ -233,15 +233,15 @@ Name="VCLinkerTool" AdditionalOptions=" /MACHINE:AMD64 /USELINK:MS_SDK" AdditionalDependencies="getbuildinfo.o" - OutputFile="./python30.dll" + OutputFile="./python31.dll" LinkIncremental="1" SuppressStartupBanner="TRUE" IgnoreDefaultLibraryNames="libc" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\./python30.pdb" + ProgramDatabaseFile=".\./python31.pdb" SubSystem="2" BaseAddress="0x1e000000" - ImportLibrary=".\./python30.lib" + ImportLibrary=".\./python31.lib" TargetMachine="0"/> <Tool Name="VCMIDLTool"/> diff --git a/PC/VS8.0/pyproject.vsprops b/PC/VS8.0/pyproject.vsprops index ae8b113..24ecf43 100644 --- a/PC/VS8.0/pyproject.vsprops +++ b/PC/VS8.0/pyproject.vsprops @@ -38,7 +38,7 @@ />
<UserMacro
Name="PyDllName"
- Value="python30"
+ Value="python31"
/>
<UserMacro
Name="PythonExe"
|