Complete move of windows builds to 2.4alpha
This commit is contained in:
parent
3576f0a6a4
commit
67e5582dfc
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue