diff options
| author | Mark Hammond <mhammond@skippinet.com.au> | 2003-07-31 02:06:22 (GMT) |
|---|---|---|
| committer | Mark Hammond <mhammond@skippinet.com.au> | 2003-07-31 02:06:22 (GMT) |
| commit | 67e5582dfc6cd365d924a0033b2ac7363e8b304d (patch) | |
| tree | 749f580d5f62992ab347a91707460ced51d6d636 | |
| parent | 3576f0a6a49511b03b62fe8bf4599e315b655939 (diff) | |
| download | cpython-67e5582dfc6cd365d924a0033b2ac7363e8b304d.zip cpython-67e5582dfc6cd365d924a0033b2ac7363e8b304d.tar.gz cpython-67e5582dfc6cd365d924a0033b2ac7363e8b304d.tar.bz2 | |
Complete move of windows builds to 2.4alpha
| -rw-r--r-- | PC/pyconfig.h | 4 | ||||
| -rw-r--r-- | PC/python_nt.rc | 12 | ||||
| -rw-r--r-- | PCbuild/pythoncore.dsp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 5653801..cde226e 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -218,9 +218,9 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ their Makefile (other compilers are generally taken care of by distutils.) */ # ifdef _DEBUG -# pragma comment(lib,"python23_d.lib") +# pragma comment(lib,"python24_d.lib") # else -# pragma comment(lib,"python23.lib") +# pragma comment(lib,"python24.lib") # endif /* _DEBUG */ # endif /* _MSC_VER */ # endif /* Py_BUILD_CORE */ diff --git a/PC/python_nt.rc b/PC/python_nt.rc index c2d1d9e..8b3858b 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -12,10 +12,10 @@ * PYTHON_DLL_NAME ditto. * MS_DLL_ID must match PY_VERSION in the Windows install script. */ -#define MS_DLL_ID "2.3" +#define MS_DLL_ID "2.4" #ifndef PYTHON_DLL_NAME -#define PYTHON_DLL_NAME "python23.dll" +#define PYTHON_DLL_NAME "python24.dll" #endif /* Nothing below this should need to be changed except for copyright @@ -33,14 +33,14 @@ * but that neither gives an error nor comes anywhere close to working. The * following comment and #define are output from PCbuild\field3.py: * - * For 2.3, + * For 2.4a0, * PY_MICRO_VERSION = 0 - * PY_RELEASE_LEVEL = 'final' = 0xf + * PY_RELEASE_LEVEL = 'alpha' = 0xa * PY_RELEASE_SERIAL = 0 * - * and 0*1000 + 15*10 + 0 = 150 + * and 0*1000 + 10*10 + 0 = 100 */ -#define FIELD3 150 +#define FIELD3 100 /* e.g., 2.1a2 * PY_VERSION comes from patchevel.h diff --git a/PCbuild/pythoncore.dsp b/PCbuild/pythoncore.dsp index afe6fe6..c59c5aa 100644 --- a/PCbuild/pythoncore.dsp +++ b/PCbuild/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:"./python23.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:"./python24.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:"./python23_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:"./python24_d.dll" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none
!ENDIF
|