Created
January 14, 2012 00:43
-
-
Save springmeyer/1609607 to your computer and use it in GitHub Desktop.
diff of python.vcproj and python2.vcproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ~/projects/python[master]$ cd PCbuild/ | |
| ~/projects/python/PCbuild[master]$ diff -u py | |
| pyd.vsprops pyexpat.vcproj python.vcproj pythoncore.vcproj | |
| pyd_d.vsprops pyproject.vsprops python3dll.vcproj pythonw.vcproj | |
| ~/projects/python/PCbuild[master]$ diff -u python.vcproj pythonw.vcproj | |
| --- python.vcproj 2012-01-13 16:22:49.000000000 -0800 | |
| +++ pythonw.vcproj 2012-01-13 16:22:49.000000000 -0800 | |
| @@ -2,8 +2,8 @@ | |
| <VisualStudioProject | |
| ProjectType="Visual C++" | |
| Version="9,00" | |
| - Name="python" | |
| - ProjectGUID="{B11D750F-CD1F-4A96-85CE-E69A5C5259F9}" | |
| + Name="pythonw" | |
| + ProjectGUID="{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" | |
| TargetFrameworkVersion="131072" | |
| > | |
| <Platforms> | |
| @@ -18,12 +18,12 @@ | |
| </ToolFiles> | |
| <Configurations> | |
| <Configuration | |
| - Name="Release|Win32" | |
| + Name="Debug|Win32" | |
| ConfigurationType="1" | |
| - InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" | |
| + InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| + CharacterSet="0" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -42,11 +42,11 @@ | |
| /> | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| + Optimization="0" | |
| + EnableIntrinsicFunctions="false" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| - StringPooling="true" | |
| - RuntimeLibrary="2" | |
| - EnableFunctionLevelLinking="true" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| + RuntimeLibrary="3" | |
| CompileAs="0" | |
| /> | |
| <Tool | |
| @@ -54,7 +54,7 @@ | |
| /> | |
| <Tool | |
| Name="VCResourceCompilerTool" | |
| - PreprocessorDefinitions="NDEBUG" | |
| + PreprocessorDefinitions="_DEBUG" | |
| Culture="1033" | |
| /> | |
| <Tool | |
| @@ -62,10 +62,10 @@ | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw_d.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| + TargetMachine="1" | |
| /> | |
| <Tool | |
| Name="VCALinkTool" | |
| @@ -90,12 +90,11 @@ | |
| /> | |
| </Configuration> | |
| <Configuration | |
| - Name="Release|x64" | |
| + Name="Debug|x64" | |
| ConfigurationType="1" | |
| - InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" | |
| + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -115,11 +114,11 @@ | |
| /> | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| + Optimization="0" | |
| + EnableIntrinsicFunctions="false" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| - StringPooling="true" | |
| - RuntimeLibrary="2" | |
| - EnableFunctionLevelLinking="true" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| + RuntimeLibrary="3" | |
| CompileAs="0" | |
| /> | |
| <Tool | |
| @@ -127,7 +126,7 @@ | |
| /> | |
| <Tool | |
| Name="VCResourceCompilerTool" | |
| - PreprocessorDefinitions="NDEBUG" | |
| + PreprocessorDefinitions="_DEBUG" | |
| Culture="1033" | |
| /> | |
| <Tool | |
| @@ -135,8 +134,7 @@ | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw_d.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| /> | |
| @@ -163,12 +161,11 @@ | |
| /> | |
| </Configuration> | |
| <Configuration | |
| - Name="Debug|Win32" | |
| + Name="Release|Win32" | |
| ConfigurationType="1" | |
| - InheritedPropertySheets=".\pyproject.vsprops;.\debug.vsprops" | |
| + InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="0" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -187,12 +184,11 @@ | |
| /> | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| - Optimization="0" | |
| - EnableIntrinsicFunctions="false" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| - RuntimeLibrary="3" | |
| - BrowseInformation="1" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| + StringPooling="true" | |
| + RuntimeLibrary="2" | |
| + EnableFunctionLevelLinking="true" | |
| CompileAs="0" | |
| /> | |
| <Tool | |
| @@ -200,19 +196,18 @@ | |
| /> | |
| <Tool | |
| Name="VCResourceCompilerTool" | |
| - PreprocessorDefinitions="_DEBUG" | |
| + PreprocessorDefinitions="NDEBUG" | |
| Culture="1033" | |
| - AdditionalIncludeDirectories="..\Include" | |
| /> | |
| <Tool | |
| Name="VCPreLinkEventTool" | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python_d.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| + TargetMachine="1" | |
| /> | |
| <Tool | |
| Name="VCALinkTool" | |
| @@ -237,12 +232,11 @@ | |
| /> | |
| </Configuration> | |
| <Configuration | |
| - Name="Debug|x64" | |
| + Name="Release|x64" | |
| ConfigurationType="1" | |
| - InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\debug.vsprops" | |
| + InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -262,12 +256,11 @@ | |
| /> | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| - Optimization="0" | |
| - EnableIntrinsicFunctions="false" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| - RuntimeLibrary="3" | |
| - BrowseInformation="1" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| + StringPooling="true" | |
| + RuntimeLibrary="2" | |
| + EnableFunctionLevelLinking="true" | |
| CompileAs="0" | |
| /> | |
| <Tool | |
| @@ -275,18 +268,16 @@ | |
| /> | |
| <Tool | |
| Name="VCResourceCompilerTool" | |
| - PreprocessorDefinitions="_DEBUG" | |
| + PreprocessorDefinitions="NDEBUG" | |
| Culture="1033" | |
| - AdditionalIncludeDirectories="..\Include" | |
| /> | |
| <Tool | |
| Name="VCPreLinkEventTool" | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python_d.exe" | |
| - SubSystem="1" | |
| - StackReserveSize="2100000" | |
| + OutputFile="$(OutDir)\pythonw.exe" | |
| + StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| /> | |
| <Tool | |
| @@ -317,7 +308,6 @@ | |
| InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pginstrument.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -337,7 +327,7 @@ | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| StringPooling="true" | |
| RuntimeLibrary="2" | |
| EnableFunctionLevelLinking="true" | |
| @@ -356,11 +346,11 @@ | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| ImportLibrary="" | |
| + TargetMachine="1" | |
| /> | |
| <Tool | |
| Name="VCALinkTool" | |
| @@ -390,7 +380,6 @@ | |
| InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pginstrument.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -411,7 +400,7 @@ | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| StringPooling="true" | |
| RuntimeLibrary="2" | |
| EnableFunctionLevelLinking="true" | |
| @@ -430,8 +419,7 @@ | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| ImportLibrary="" | |
| @@ -465,7 +453,6 @@ | |
| InheritedPropertySheets=".\pyproject.vsprops;.\release.vsprops;.\pgupdate.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -485,7 +472,7 @@ | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| StringPooling="true" | |
| RuntimeLibrary="2" | |
| EnableFunctionLevelLinking="true" | |
| @@ -504,11 +491,11 @@ | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| ImportLibrary="" | |
| + TargetMachine="1" | |
| /> | |
| <Tool | |
| Name="VCALinkTool" | |
| @@ -538,7 +525,6 @@ | |
| InheritedPropertySheets=".\pyproject.vsprops;.\x64.vsprops;.\release.vsprops;.\pgupdate.vsprops" | |
| UseOfMFC="0" | |
| ATLMinimizesCRunTimeLibraryUsage="false" | |
| - CharacterSet="2" | |
| > | |
| <Tool | |
| Name="VCPreBuildEventTool" | |
| @@ -559,7 +545,7 @@ | |
| <Tool | |
| Name="VCCLCompilerTool" | |
| AdditionalIncludeDirectories="" | |
| - PreprocessorDefinitions="_CONSOLE" | |
| + PreprocessorDefinitions="_WINDOWS" | |
| StringPooling="true" | |
| RuntimeLibrary="2" | |
| EnableFunctionLevelLinking="true" | |
| @@ -578,8 +564,7 @@ | |
| /> | |
| <Tool | |
| Name="VCLinkerTool" | |
| - OutputFile="$(OutDir)\python.exe" | |
| - SubSystem="1" | |
| + OutputFile="$(OutDir)\pythonw.exe" | |
| StackReserveSize="2000000" | |
| BaseAddress="0x1d000000" | |
| ImportLibrary="" | |
| @@ -615,10 +600,6 @@ | |
| Name="Resource Files" | |
| > | |
| <File | |
| - RelativePath="..\PC\pycon.ico" | |
| - > | |
| - </File> | |
| - <File | |
| RelativePath="..\PC\python_exe.rc" | |
| > | |
| </File> | |
| @@ -627,7 +608,7 @@ | |
| Name="Source Files" | |
| > | |
| <File | |
| - RelativePath="..\Modules\python.c" | |
| + RelativePath="..\PC\WinMain.c" | |
| > | |
| </File> | |
| </Filter> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment