Report #1473 Drop _EXPORTS macros in PCbuild9
I've removed a bunch of obsolete defines. I've also taken the opportunity to fix the pre-link event of sqlite3 and some optimization flags.
diff --git a/PCbuild9/_bsddb.vcproj b/PCbuild9/_bsddb.vcproj
index e558036..c2e1ffd 100644
--- a/PCbuild9/_bsddb.vcproj
+++ b/PCbuild9/_bsddb.vcproj
@@ -43,7 +43,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir)"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -111,7 +110,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bsddbDir)"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -122,7 +120,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build "Debug AMD64" /project db_static /useenv"
+ CommandLine="cd $(bsddbDir)
if exist Debug_AMD64\libdb44sd.lib exit 0
devenv Berkeley_DB.sln /build "Debug AMD64" /project db_static /useenv
"
/>
<Tool
Name="VCLinkerTool"
@@ -180,7 +178,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(bsddbDir)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -193,7 +190,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static"
+ CommandLine="cd $(bsddbDir)
if exist Release\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build Release /project db_static
"
/>
<Tool
Name="VCLinkerTool"
@@ -254,7 +251,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(bsddbDir)"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -267,7 +263,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv"
+ CommandLine="cd $(bsddbDir)
if exist Release_AMD64\libdb44s.lib exit 0
devenv Berkeley_DB.sln /build "Release AMD64" /project db_static /useenv
"
/>
<Tool
Name="VCLinkerTool"
diff --git a/PCbuild9/_ctypes.vcproj b/PCbuild9/_ctypes.vcproj
index f532840..8eb5d69 100644
--- a/PCbuild9/_ctypes.vcproj
+++ b/PCbuild9/_ctypes.vcproj
@@ -43,7 +43,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -110,7 +109,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -178,7 +176,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -249,7 +246,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..\Modules\_ctypes\libffi_msvc"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -396,7 +392,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)""
+ CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
"
/>
</FileConfiguration>
<FileConfiguration
@@ -412,7 +408,7 @@
>
<Tool
Name="VCCustomBuildTool"
- CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)""
+ CommandLine="ml64 /nologo /c /Fo "$(IntDir)\win64.obj" "$(InputPath)"
"
Outputs="$(IntDir)\win64.obj"
/>
</FileConfiguration>
diff --git a/PCbuild9/_ctypes_test.vcproj b/PCbuild9/_ctypes_test.vcproj
index 7c9f2ef..b9cdfb0 100644
--- a/PCbuild9/_ctypes_test.vcproj
+++ b/PCbuild9/_ctypes_test.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -106,7 +105,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -171,7 +169,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -241,7 +238,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/_msi.vcproj b/PCbuild9/_msi.vcproj
index 31cd83b..61267c4 100644
--- a/PCbuild9/_msi.vcproj
+++ b/PCbuild9/_msi.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -108,7 +107,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -175,7 +173,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -247,7 +244,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/_socket.vcproj b/PCbuild9/_socket.vcproj
index 95d3dea..41f4499 100644
--- a/PCbuild9/_socket.vcproj
+++ b/PCbuild9/_socket.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -108,7 +107,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -175,7 +173,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -247,7 +244,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/_sqlite3.vcproj b/PCbuild9/_sqlite3.vcproj
index 57b4bc6..4030e95 100644
--- a/PCbuild9/_sqlite3.vcproj
+++ b/PCbuild9/_sqlite3.vcproj
@@ -54,7 +54,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
+ CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
/>
<Tool
Name="VCLinkerTool"
@@ -122,7 +122,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
+ CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
/>
<Tool
Name="VCLinkerTool"
@@ -193,7 +193,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
+ CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
/>
<Tool
Name="VCLinkerTool"
@@ -267,7 +267,7 @@
/>
<Tool
Name="VCPreLinkEventTool"
- CommandLine="cd $(sqlite3Dir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /LTCG /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
+ CommandLine="cd $(sqlite3Dir)
if not exist $(OutDir)\sqlite3.dll if exist sqlite3.dll copy sqlite3.dll $(OutDir)
if exist $(PlatformName)\sqlite3.lib exit 0
if not exist $(PlatformName) mkdir $(PlatformName)
cd $(PlatformName)
cl /Ox /Ob1 /Oi /GL /GF /FD /MD /Gy ..\*.c
link /INCREMENTAL:NO /NOLOGO /DLL /OPT:REF /OPT:ICF /def:..\sqlite3.def /dll /out:sqlite3.dll *.obj
if not exist $(OutDir)\sqlite3.dll copy sqlite3.dll $(OutDir)"
/>
<Tool
Name="VCLinkerTool"
diff --git a/PCbuild9/_ssl.vcproj b/PCbuild9/_ssl.vcproj
index 0fcad8d..6bb9531 100644
--- a/PCbuild9/_ssl.vcproj
+++ b/PCbuild9/_ssl.vcproj
@@ -44,7 +44,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(opensslDir)\inc32"
- PreprocessorDefinitions="_SOCKET_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -112,7 +111,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(opensslDir)\inc64"
- PreprocessorDefinitions="_SOCKET_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -181,7 +179,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(opensslDir)\inc32"
- PreprocessorDefinitions="_SOCKET_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -255,7 +252,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(opensslDir)\inc64"
- PreprocessorDefinitions="_SOCKET_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/_template.vcproj b/PCbuild9/_template.vcproj
deleted file mode 100644
index f8b2785..0000000
--- a/PCbuild9/_template.vcproj
+++ /dev/null
@@ -1,227 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="9,00"
- Name="_template"
- ProjectGUID="{31FFC478-7B4A-43E8-9954-8D03E2187E9C}"
- RootNamespace="_template"
- Keyword="Win32Proj"
- TargetFrameworkVersion="196613"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Debug|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\pyd_d.vsprops"
- CharacterSet="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
- UsePrecompiledHeader="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="2"
- GenerateDebugInformation="true"
- SubSystem="2"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="Release|Win32"
- ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- <Configuration
- Name="ReleaseAMD64|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
- ConfigurationType="2"
- InheritedPropertySheets=".\pyd.vsprops;.\amd64.vsprops"
- CharacterSet="1"
- WholeProgramOptimization="1"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- />
- <Tool
- Name="VCCLCompilerTool"
- EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
- UsePrecompiledHeader="0"
- WarningLevel="3"
- DebugInformationFormat="3"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- LinkIncremental="1"
- GenerateDebugInformation="true"
- SubSystem="2"
- OptimizeReferences="2"
- EnableCOMDATFolding="2"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Globals>
- </Globals>
-</VisualStudioProject>
diff --git a/PCbuild9/_testcapi.vcproj b/PCbuild9/_testcapi.vcproj
index 7a12ae6..a169bd8 100644
--- a/PCbuild9/_testcapi.vcproj
+++ b/PCbuild9/_testcapi.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -107,7 +106,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -173,7 +171,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -244,7 +241,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/_tkinter.vcproj b/PCbuild9/_tkinter.vcproj
index 6a86dab..96c3670 100644
--- a/PCbuild9/_tkinter.vcproj
+++ b/PCbuild9/_tkinter.vcproj
@@ -43,7 +43,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(tcltkDir)\include"
- PreprocessorDefinitions="_TKINTER_EXPORTS;WITH_APPINIT"
+ PreprocessorDefinitions="WITH_APPINIT"
UsePrecompiledHeader="0"
/>
<Tool
@@ -109,7 +109,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(tcltkDir)\include"
- PreprocessorDefinitions="_TKINTER_EXPORTS;WITH_APPINIT"
+ PreprocessorDefinitions="WITH_APPINIT"
UsePrecompiledHeader="0"
/>
<Tool
@@ -176,7 +176,7 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(tcltkDir)\include"
- PreprocessorDefinitions="_TKINTER_EXPORTS;WITH_APPINIT"
+ PreprocessorDefinitions="WITH_APPINIT"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -248,7 +248,7 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(tcltkDir)\include"
- PreprocessorDefinitions="_TKINTER_EXPORTS;WITH_APPINIT"
+ PreprocessorDefinitions="WITH_APPINIT"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/bz2.vcproj b/PCbuild9/bz2.vcproj
index 407b3b9..f458ab8 100644
--- a/PCbuild9/bz2.vcproj
+++ b/PCbuild9/bz2.vcproj
@@ -43,7 +43,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)"
- PreprocessorDefinitions="BZ2_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -111,7 +110,6 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(bz2Dir)"
- PreprocessorDefinitions="BZ2_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -180,7 +178,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(bz2Dir)"
- PreprocessorDefinitions="BZ2_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -254,7 +251,6 @@
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="$(bz2Dir)"
- PreprocessorDefinitions="BZ2_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/make_buildinfo.vcproj b/PCbuild9/make_buildinfo.vcproj
index f5a53fe..6a6ff17 100644
--- a/PCbuild9/make_buildinfo.vcproj
+++ b/PCbuild9/make_buildinfo.vcproj
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
/>
diff --git a/PCbuild9/make_versioninfo.vcproj b/PCbuild9/make_versioninfo.vcproj
index a1f31fd..5199d84 100644
--- a/PCbuild9/make_versioninfo.vcproj
+++ b/PCbuild9/make_versioninfo.vcproj
@@ -48,7 +48,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -71,6 +71,8 @@
GenerateDebugInformation="true"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
+ OptimizeReferences="2"
+ EnableCOMDATFolding="2"
BaseAddress="0x1d000000"
/>
<Tool
@@ -96,6 +98,62 @@
CommandLine="$(TargetFileName) > ..\PC\python_nt.h"
/>
</Configuration>
+ <Configuration
+ Name="Release|x64"
+ ConfigurationType="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
</Configurations>
<References>
</References>
diff --git a/PCbuild9/pyd.vsprops b/PCbuild9/pyd.vsprops
index 2a69d95..7600ee6 100644
--- a/PCbuild9/pyd.vsprops
+++ b/PCbuild9/pyd.vsprops
@@ -7,7 +7,7 @@
>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="NDEBUG"
+ PreprocessorDefinitions="NDEBUG;_USRDLL"
RuntimeLibrary="2"
/>
<Tool
diff --git a/PCbuild9/pyd_d.vsprops b/PCbuild9/pyd_d.vsprops
index 8fc10b9..6964c84 100644
--- a/PCbuild9/pyd_d.vsprops
+++ b/PCbuild9/pyd_d.vsprops
@@ -9,7 +9,7 @@
Name="VCCLCompilerTool"
Optimization="0"
InlineFunctionExpansion="0"
- PreprocessorDefinitions="_DEBUG"
+ PreprocessorDefinitions="_DEBUG;_USERDLL"
RuntimeLibrary="3"
/>
<Tool
diff --git a/PCbuild9/python.vcproj b/PCbuild9/python.vcproj
index e470bed..7982859 100644
--- a/PCbuild9/python.vcproj
+++ b/PCbuild9/python.vcproj
@@ -45,7 +45,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -71,7 +71,6 @@
StackReserveSize="2000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
BaseAddress="0x1d000000"
/>
<Tool
@@ -125,7 +124,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+ PreprocessorDefinitions="NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -151,7 +150,6 @@
StackReserveSize="2000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
BaseAddress="0x1d000000"
/>
<Tool
@@ -203,7 +201,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
BrowseInformation="1"
@@ -279,7 +277,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+ PreprocessorDefinitions="_DEBUG;_CONSOLE"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
BrowseInformation="1"
diff --git a/PCbuild9/pythoncore.vcproj b/PCbuild9/pythoncore.vcproj
index a8c25d6..9da012a 100644
--- a/PCbuild9/pythoncore.vcproj
+++ b/PCbuild9/pythoncore.vcproj
@@ -44,7 +44,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
- PreprocessorDefinitions="NDEBUG;USE_DL_EXPORT"
+ PreprocessorDefinitions="NDEBUG;USE_DL_EXPORT;_USRDLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
/>
@@ -70,7 +70,6 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName).lib"
/>
@@ -123,7 +122,7 @@
Name="VCCLCompilerTool"
AdditionalOptions="/Zm200 "
AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
- PreprocessorDefinitions="NDEBUG;USE_DL_EXPORT"
+ PreprocessorDefinitions="NDEBUG;USE_DL_EXPORT;_USRDLL"
RuntimeLibrary="2"
UsePrecompiledHeader="0"
/>
@@ -149,7 +148,6 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName).lib"
/>
@@ -203,7 +201,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT"
+ PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;_USRDLL"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
/>
@@ -281,7 +279,7 @@
Optimization="0"
InlineFunctionExpansion="0"
AdditionalIncludeDirectories="..\Python;..\Modules\zlib"
- PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT"
+ PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;_USRDLL"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
/>
diff --git a/PCbuild9/pythonw.vcproj b/PCbuild9/pythonw.vcproj
index 6b08fa9..e32b42d 100644
--- a/PCbuild9/pythonw.vcproj
+++ b/PCbuild9/pythonw.vcproj
@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_DEBUG;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
CompileAs="0"
@@ -116,7 +116,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_DEBUG;_WINDOWS"
RuntimeLibrary="3"
UsePrecompiledHeader="0"
CompileAs="0"
@@ -188,7 +188,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -213,7 +213,6 @@
StackReserveSize="2000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
BaseAddress="0x1d000000"
TargetMachine="1"
/>
@@ -267,7 +266,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=""
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="NDEBUG;_WINDOWS"
StringPooling="true"
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
@@ -292,7 +291,6 @@
StackReserveSize="2000000"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- LinkTimeCodeGeneration="1"
BaseAddress="0x1d000000"
/>
<Tool
diff --git a/PCbuild9/select.vcproj b/PCbuild9/select.vcproj
index 9985620..ba7e88e 100644
--- a/PCbuild9/select.vcproj
+++ b/PCbuild9/select.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -109,7 +108,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -177,7 +175,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -250,7 +247,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/unicodedata.vcproj b/PCbuild9/unicodedata.vcproj
index 43c0bbd..a617672 100644
--- a/PCbuild9/unicodedata.vcproj
+++ b/PCbuild9/unicodedata.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -107,7 +106,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -173,7 +171,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -244,7 +241,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="MMAP_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
diff --git a/PCbuild9/w9xpopen.vcproj b/PCbuild9/w9xpopen.vcproj
index 9596806..6b6bafb 100644
--- a/PCbuild9/w9xpopen.vcproj
+++ b/PCbuild9/w9xpopen.vcproj
@@ -44,7 +44,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_DEBUG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -113,7 +113,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
+ PreprocessorDefinitions="_DEBUG"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
@@ -182,7 +182,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
@@ -254,7 +254,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+ PreprocessorDefinitions="NDEBUG"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
diff --git a/PCbuild9/winsound.vcproj b/PCbuild9/winsound.vcproj
index be03ba6..9bb0f54 100644
--- a/PCbuild9/winsound.vcproj
+++ b/PCbuild9/winsound.vcproj
@@ -42,7 +42,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -107,7 +106,6 @@
/>
<Tool
Name="VCCLCompilerTool"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
/>
<Tool
@@ -173,7 +171,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -244,7 +241,6 @@
<Tool
Name="VCCLCompilerTool"
EnableIntrinsicFunctions="true"
- PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WINSOUND_EXPORTS"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"