Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,6050… · pythoncapi/cpython@a822314 · GitHub
Skip to content

Commit a822314

Browse files
tirantiran
committed
Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60696-60698 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r60696 | christian.heimes | 2008-02-09 20:55:22 +0100 (Sat, 09 Feb 2008) | 5 lines Issue python#1706: Require Windows 2000+ Added Py_BUILD_CORE_MODULES macro to set WINVER and NTDDI_VERSION to Windows 2000 for core modules, too Added -d option to build.bat (same as -c Debug) and fixed warning about /build option Updated Windows related readme.txt files ........
1 parent 3ecfea7 commit a822314

6 files changed

Lines changed: 31 additions & 20 deletions

File tree

‎PC/pyconfig.h‎

Lines changed: 9 additions & 4 deletions

‎PC/readme.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
Welcome to the "PC" subdirectory of the Python distribution
22
***********************************************************
33

4-
*** Note: the project files for MS VC++ 7.1 are now in the
5-
*** PCbuild directory. See the file readme.txt there for build
6-
*** instructions. There is some information below that might
7-
*** still be relevant.
8-
94
This "PC" subdirectory contains complete project files to make
105
several older PC ports of Python, as well as all the PC-specific
116
Python source files. It should be located in the root of the
@@ -79,18 +74,23 @@ dllbase_nt.txt A (manually maintained) list of base addresses for
7974
example_nt A subdirectory showing how to build an extension as a
8075
DLL.
8176

82-
Visual Studio 6.0
83-
=================
84-
The subdirectory VC6 contains Visual Studio 6 project files. These
85-
were originally located in the PCBuild directory, but are no longer
86-
maintained.
77+
Legacy support for older versions of Visual Studio
78+
==================================================
79+
The subdirectories VC6, VS7.1 and VS8.0 contain legacy support older
80+
versions of Microsoft Visual Studio. See PCbuild/readme.txt.
81+
82+
EMX development tools for OS/2
83+
==============================
8784

85+
See os2emx/readme.txt. This platform is maintained by Andrew MacIntyre.
8886

8987
IBM VisualAge C/C++ for OS/2
9088
============================
9189

9290
See os2vacpp/readme.txt. This platform is supported by Jeff Rush.
9391

92+
NOTE: Support for os2vacpp may be dropped in the near future. Please move
93+
to EMX.
9494

9595
Note for Windows 3.x and DOS users
9696
==================================

‎PCbuild/build.bat‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ rem just for convenience.
55
setlocal
66
set platf=Win32
77
set conf=Release
8-
set build=/build
8+
set build=
99

1010
:CheckOpts
11-
if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
11+
if "%1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
1212
if "%1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
13-
if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
13+
if "%1"=="-r" (set build=/rebuild) & shift & goto CheckOpts
14+
if "%1"=="-d" (set conf=Debug) & shift & goto CheckOpts
1415

1516
set cmd=vcbuild /useenv pcbuild.sln %build% "%conf%|%platf%"
1617
echo %cmd%

‎PCbuild/pyd.vsprops‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
>
88
<Tool
99
Name="VCCLCompilerTool"
10+
PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
1011
RuntimeLibrary="2"
1112
/>
1213
<Tool

‎PCbuild/pyd_d.vsprops‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
Optimization="0"
1111
InlineFunctionExpansion="0"
1212
EnableIntrinsicFunctions="false"
13+
PreprocessorDefinitions="Py_BUILD_CORE_MODULE"
1314
RuntimeLibrary="3"
1415
/>
1516
<Tool

‎PCbuild/readme.txt‎

Lines changed: 6 additions & 3 deletions

0 commit comments

Comments
 (0)