From 0149d94163f24582e3d3d42d37bd303933234766 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Fri, 10 Oct 2003 16:57:45 +0000 Subject: To build on windows, the manual editing of the python_nt.rc file to change the version number is no longer required. Instead, a make_versioninfo.exe is compiled, which spits out an include file for python_nt.rc. Will backport to 2.3 --- PC/python_nt.rc | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) (limited to 'PC/python_nt.rc') diff --git a/PC/python_nt.rc b/PC/python_nt.rc index 8b3858bce6..3cdc93c019 100644 --- a/PC/python_nt.rc +++ b/PC/python_nt.rc @@ -6,42 +6,12 @@ #define MS_WINDOWS #include "modsupport.h" #include "patchlevel.h" - -/* Across releases, change: - * MS_DLL_ID if the minor version number changes. - * PYTHON_DLL_NAME ditto. - * MS_DLL_ID must match PY_VERSION in the Windows install script. - */ -#define MS_DLL_ID "2.4" - -#ifndef PYTHON_DLL_NAME -#define PYTHON_DLL_NAME "python24.dll" +#ifdef _DEBUG +# include "pythonnt_rc_d.h" +#else +# include "pythonnt_rc.h" #endif -/* Nothing below this should need to be changed except for copyright - * notices, company name, and FIELD3. Unfortunately, all attempts - * to get the resource compiler to do arithmetic in macros have - * failed miserably -- it gives syntax errors, ignores operators, - * or does stuff that's simply bizarre. - */ - - -/* This is what we'd like FIELD3 to be: - * - * #define FIELD3 (PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL) - * - * 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.4a0, - * PY_MICRO_VERSION = 0 - * PY_RELEASE_LEVEL = 'alpha' = 0xa - * PY_RELEASE_SERIAL = 0 - * - * and 0*1000 + 10*10 + 0 = 100 - */ -#define FIELD3 100 - /* e.g., 2.1a2 * PY_VERSION comes from patchevel.h */ -- cgit v1.2.1