Mercurial > cpython-lru_cache-weakref
diff PCbuild/pythoncore.vcproj @ 35775:144b52535434 legacy-trunk
Remove conflict markers and add parsermodule.c to get things building
| author | Mark Hammond <mhammond@skippinet.com.au> |
|---|---|
| date | Sun, 23 Oct 2005 10:50:04 +0000 |
| parents | 1c4d192f1568 |
| children | 08e80a2bf40c |
line wrap: on
line diff
--- a/PCbuild/pythoncore.vcproj Sun Oct 23 04:47:13 2005 +0000 +++ b/PCbuild/pythoncore.vcproj Sun Oct 23 10:50:04 2005 +0000 @@ -815,6 +815,9 @@ RelativePath="..\Modules\collectionsmodule.c"> </File> <File + RelativePath="..\Python\compile.c"> + </File> + <File RelativePath="..\Objects\complexobject.c"> <FileConfiguration Name="Release|Win32"> @@ -2318,9 +2321,6 @@ </FileConfiguration> </File> <File - RelativePath="..\Python\compile.c"> - </File> - <File RelativePath="..\Parser\node.c"> <FileConfiguration Name="Release|Win32"> @@ -2456,6 +2456,9 @@ </FileConfiguration> </File> <File + RelativePath="..\Modules\parsermodule.c"> + </File> + <File RelativePath="..\Parser\parsetok.c"> <FileConfiguration Name="Release|Win32"> @@ -2759,6 +2762,87 @@ </FileConfiguration> </File> <File + RelativePath="..\Modules\sha256module.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="ReleaseItanium|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> + </FileConfiguration> + </File> + <File + RelativePath="..\Modules\sha512module.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="ReleaseItanium|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> + </FileConfiguration> + </File> + <File + RelativePath="..\Modules\sha512module.c"> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> + </FileConfiguration> + <FileConfiguration + Name="ReleaseItanium|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> + </FileConfiguration> + </File> + <File RelativePath="..\Modules\shamodule.c"> <FileConfiguration Name="Release|Win32"> @@ -2786,92 +2870,7 @@ </FileConfiguration> </File> <File -<<<<<<< pythoncore.vcproj - RelativePath="..\Modules\sha256module.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - </File> - <File - RelativePath="..\Modules\sha512module.c"> - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - </File> - <File RelativePath="..\Modules\signalmodule.c"> -======= - RelativePath="..\Modules\sha256module.c"> ->>>>>>> 1.26.2.3 - <FileConfiguration - Name="Release|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="Debug|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="0" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="_DEBUG;USE_DL_EXPORT;WIN32;_WINDOWS;$(NoInherit)"/> - </FileConfiguration> - <FileConfiguration - Name="ReleaseItanium|Win32"> - <Tool - Name="VCCLCompilerTool" - Optimization="2" - AdditionalIncludeDirectories="" - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;USE_DL_EXPORT;$(NoInherit)"/> - </FileConfiguration> - </File> - <File - RelativePath="..\Modules\sha512module.c"> <FileConfiguration Name="Release|Win32"> <Tool