diff options
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/build.bat | 7 | ||||
| -rw-r--r-- | PCbuild/pyd.vsprops | 1 | ||||
| -rw-r--r-- | PCbuild/pyd_d.vsprops | 1 | ||||
| -rw-r--r-- | PCbuild/readme.txt | 9 |
4 files changed, 12 insertions, 6 deletions
diff --git a/PCbuild/build.bat b/PCbuild/build.bat index d181daf..a73560e 100644 --- a/PCbuild/build.bat +++ b/PCbuild/build.bat @@ -5,12 +5,13 @@ rem just for convenience. setlocal set platf=Win32 set conf=Release -set build=/build +set build= :CheckOpts -if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts +if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts -if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts +if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts +if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%" echo %cmd% diff --git a/PCbuild/pyd.vsprops b/PCbuild/pyd.vsprops index 2e21a80..726cebd 100644 --- a/PCbuild/pyd.vsprops +++ b/PCbuild/pyd.vsprops @@ -7,6 +7,7 @@ > <Tool Name="VCCLCompilerTool" + PreprocessorDefinitions="Py_BUILD_CORE_MODULE" RuntimeLibrary="2" /> <Tool diff --git a/PCbuild/pyd_d.vsprops b/PCbuild/pyd_d.vsprops index b8f98f6..f838b67 100644 --- a/PCbuild/pyd_d.vsprops +++ b/PCbuild/pyd_d.vsprops @@ -10,6 +10,7 @@ Optimization="0" InlineFunctionExpansion="0" EnableIntrinsicFunctions="false" + PreprocessorDefinitions="Py_BUILD_CORE_MODULE" RuntimeLibrary="3" /> <Tool diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 2b2d1f8..f8b3f65 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -19,7 +19,7 @@ folders or profile guided optimization (PGO). The missing bits and pieces won't stop you from building Python. The solution is configured to build the projects in the correct order. "Build -Solution" or F6 takes care of dependencies except for x64 builds. To make +Solution" or F7 takes care of dependencies except for x64 builds. To make cross compiling x64 builds on a 32bit OS possible the x64 builds require a 32bit version of Python. @@ -30,7 +30,8 @@ NOTE: running a Python core buildbot test slave; see SUBPROJECTS below) When using the Debug setting, the output files have a _d added to -their name: python30_d.dll, python_d.exe, parser_d.pyd, and so on. +their name: python30_d.dll, python_d.exe, parser_d.pyd, and so on. Both +the build and rt batch files accept a -d option for debug builds. The 32bit builds end up in the solution folder PCbuild while the x64 builds land in the amd64 subfolder. The PGI and PGO builds for profile guided @@ -122,6 +123,8 @@ _tkinter Use x64 instead of Win32 for the x64 platform. + NOTE: Tcl/Tk 8.4 doesn't compile for x64. + Build Tcl first --------------- Use "Start -> All Programs -> Microsoft Visual Studio 2008 @@ -285,7 +288,7 @@ Building for Itanium NOTE: Official support for Itanium builds have been dropped from the build. Please -contact as and provide patches if you are interested in Itanium builds. +contact us and provide patches if you are interested in Itanium builds. The project files support a ReleaseItanium configuration which creates Win64/Itanium binaries. For this to work, you need to install the Platform |