Removed or replaced some more deprecated preprocessor macros.
Moved the _DEBUG and NDEBUG macros to two new property files.
Fixed #1527 Problem with static libs on Windows
Updated README.txt
diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj
index 1bc1dad..0013e9c 100644
--- a/PCbuild9/pythonw.vcproj
+++ b/PCbuild9/pythonw.vcproj
@@ -20,7 +20,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="0"
@@ -45,7 +45,7 @@
Optimization="0"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
RuntimeLibrary="3"
CompileAs="0"
/>
@@ -92,7 +92,7 @@
<Configuration
Name="Debug|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -117,7 +117,7 @@
Optimization="0"
EnableIntrinsicFunctions="false"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
RuntimeLibrary="3"
CompileAs="0"
/>
@@ -163,7 +163,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -185,7 +185,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -234,7 +234,7 @@
<Configuration
Name="Release|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -257,7 +257,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -305,7 +305,7 @@
<Configuration
Name="PGInstrument|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\pginstrument.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -327,7 +327,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -377,7 +377,7 @@
<Configuration
Name="PGInstrument|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pginstrument.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -400,7 +400,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -450,7 +450,7 @@
<Configuration
Name="PGUpdate|Win32"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\pgupdate.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -472,7 +472,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -522,7 +522,7 @@
<Configuration
Name="PGUpdate|x64"
ConfigurationType="1"
- InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
+ InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\pgupdate.vsprops;.\release.vsprops"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
>
@@ -545,7 +545,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"