Commit 60954356 authored by Hirokazu Yamamoto's avatar Hirokazu Yamamoto

Updated PC/VS8.0 with PCBuild/vs9to8.py.

parent 68201bdb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="_multiprocessing" Name="_multiprocessing"
ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}" ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"
RootNamespace="_multiprocessing" RootNamespace="_multiprocessing"
Keyword="Win32Proj" Keyword="Win32Proj"
TargetFrameworkVersion="196613" TargetFrameworkVersion="196613"
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -354,7 +354,7 @@ ...@@ -354,7 +354,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
...@@ -480,7 +480,7 @@ ...@@ -480,7 +480,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;" PreprocessorDefinitions="MODULE_NAME=\&quot;sqlite3\&quot;"
/> />
<Tool <Tool
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib" AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib" AdditionalIncludeDirectories="..\..\PC\bdist_wininst;..\..\Include;..\..\Modules\zlib"
PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE" PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="0"
EnableFunctionLevelLinking="true" EnableFunctionLevelLinking="true"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="true" SuppressStartupBanner="true"
......
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet <VisualStudioPropertySheet
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
OutputFile="$(OutDir)\$(ProjectName).pyd" OutputFile="$(OutDir)\$(ProjectName).pyd"
ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb" ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
ImportLibrary="$(OutDir)\$(TargetName).lib" ImportLibrary="$(OutDir)\$(TargetName).lib"
GenerateManifest="false"
/>
<Tool
Name="VCManifestTool"
EmbedManifest="false"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
......
...@@ -19,6 +19,11 @@ ...@@ -19,6 +19,11 @@
LinkIncremental="1" LinkIncremental="1"
ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb" ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
ImportLibrary="$(OutDir)\$(TargetName).lib" ImportLibrary="$(OutDir)\$(TargetName).lib"
GenerateManifest="false"
/>
<Tool
Name="VCManifestTool"
EmbedManifest="false"
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
/> />
<UserMacro <UserMacro
Name="sqlite3Dir" Name="sqlite3Dir"
Value="$(externalsDir)\sqlite-3.5.9" Value="$(externalsDir)\sqlite-3.6.21"
/> />
<UserMacro <UserMacro
Name="bz2Dir" Name="bz2Dir"
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-0.9.8g" Value="$(externalsDir)\openssl-1.0.0a"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"
......
...@@ -702,10 +702,6 @@ ...@@ -702,10 +702,6 @@
RelativePath="..\..\Include\dictobject.h" RelativePath="..\..\Include\dictobject.h"
> >
</File> </File>
<File
RelativePath="..\..\Include\dtoa.h"
>
</File>
<File <File
RelativePath="..\..\Include\dynamic_annotations.h" RelativePath="..\..\Include\dynamic_annotations.h"
> >
...@@ -846,6 +842,10 @@ ...@@ -846,6 +842,10 @@
RelativePath="..\..\Include\pyarena.h" RelativePath="..\..\Include\pyarena.h"
> >
</File> </File>
<File
RelativePath="..\..\Include\pycapsule.h"
>
</File>
<File <File
RelativePath="..\..\Include\pyctype.h" RelativePath="..\..\Include\pyctype.h"
> >
...@@ -902,6 +902,10 @@ ...@@ -902,6 +902,10 @@
RelativePath="..\..\Include\pystrtod.h" RelativePath="..\..\Include\pystrtod.h"
> >
</File> </File>
<File
RelativePath="..\..\Include\dtoa.h"
>
</File>
<File <File
RelativePath="..\..\Include\Python-ast.h" RelativePath="..\..\Include\Python-ast.h"
> >
...@@ -946,10 +950,6 @@ ...@@ -946,10 +950,6 @@
RelativePath="..\..\Include\sysmodule.h" RelativePath="..\..\Include\sysmodule.h"
> >
</File> </File>
<File
RelativePath="..\..\Include\_time.h"
>
</File>
<File <File
RelativePath="..\..\Include\timefuncs.h" RelativePath="..\..\Include\timefuncs.h"
> >
...@@ -998,38 +998,6 @@ ...@@ -998,38 +998,6 @@
RelativePath="..\..\Modules\_csv.c" RelativePath="..\..\Modules\_csv.c"
> >
</File> </File>
<Filter
Name="_io"
>
<File
RelativePath="..\..\Modules\_io\fileio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bytesio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\stringio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bufferedio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\iobase.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\textio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.c"
>
</File>
</Filter>
<File <File
RelativePath="..\..\Modules\_functoolsmodule.c" RelativePath="..\..\Modules\_functoolsmodule.c"
> >
...@@ -1074,6 +1042,14 @@ ...@@ -1074,6 +1042,14 @@
RelativePath="..\..\Modules\_struct.c" RelativePath="..\..\Modules\_struct.c"
> >
</File> </File>
<File
RelativePath="..\..\Modules\_time.c"
>
</File>
<File
RelativePath="..\..\Modules\_time.h"
>
</File>
<File <File
RelativePath="..\..\Modules\_weakref.c" RelativePath="..\..\Modules\_weakref.c"
> >
...@@ -1174,10 +1150,6 @@ ...@@ -1174,10 +1150,6 @@
RelativePath="..\..\Modules\_threadmodule.c" RelativePath="..\..\Modules\_threadmodule.c"
> >
</File> </File>
<File
RelativePath="..\..\Modules\_time.c"
>
</File>
<File <File
RelativePath="..\..\Modules\timemodule.c" RelativePath="..\..\Modules\timemodule.c"
> >
...@@ -1194,6 +1166,42 @@ ...@@ -1194,6 +1166,42 @@
RelativePath="..\..\Modules\zlibmodule.c" RelativePath="..\..\Modules\zlibmodule.c"
> >
</File> </File>
<Filter
Name="_io"
>
<File
RelativePath="..\..\Modules\_io\fileio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bytesio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\stringio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\bufferedio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\iobase.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\textio.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.c"
>
</File>
<File
RelativePath="..\..\Modules\_io\_iomodule.h"
>
</File>
</Filter>
<Filter <Filter
Name="zlib" Name="zlib"
> >
...@@ -1670,10 +1678,6 @@ ...@@ -1670,10 +1678,6 @@
RelativePath="..\..\Python\dynamic_annotations.c" RelativePath="..\..\Python\dynamic_annotations.c"
> >
</File> </File>
<File
RelativePath="..\..\Python\dtoa.c"
>
</File>
<File <File
RelativePath="..\..\Python\dynload_win.c" RelativePath="..\..\Python\dynload_win.c"
> >
...@@ -1786,6 +1790,10 @@ ...@@ -1786,6 +1790,10 @@
RelativePath="..\..\Python\pystrtod.c" RelativePath="..\..\Python\pystrtod.c"
> >
</File> </File>
<File
RelativePath="..\..\Python\dtoa.c"
>
</File>
<File <File
RelativePath="..\..\Python\Python-ast.c" RelativePath="..\..\Python\Python-ast.c"
> >
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops"
CharacterSet="0" CharacterSet="0"
> >
<Tool <Tool
...@@ -42,8 +42,7 @@ ...@@ -42,8 +42,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -83,7 +82,7 @@ ...@@ -83,7 +82,7 @@
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd_d.vsprops;.\x64.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\debug.vsprops;.\x64.vsprops"
CharacterSet="0" CharacterSet="0"
> >
<Tool <Tool
...@@ -104,8 +103,7 @@ ...@@ -104,8 +103,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -145,7 +143,7 @@ ...@@ -145,7 +143,7 @@
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops" InheritedPropertySheets=".\sqlite3.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -166,8 +164,7 @@ ...@@ -166,8 +164,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -207,7 +204,7 @@ ...@@ -207,7 +204,7 @@
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -229,8 +226,7 @@ ...@@ -229,8 +226,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -270,7 +266,7 @@ ...@@ -270,7 +266,7 @@
<Configuration <Configuration
Name="PGInstrument|Win32" Name="PGInstrument|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pginstrument.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\pginstrument.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -291,8 +287,7 @@ ...@@ -291,8 +287,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories="&quot;..\..\..\sqlite-3.6.21&quot;"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -332,7 +327,7 @@ ...@@ -332,7 +327,7 @@
<Configuration <Configuration
Name="PGInstrument|x64" Name="PGInstrument|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pginstrument.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pginstrument.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -354,8 +349,7 @@ ...@@ -354,8 +349,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -394,7 +388,7 @@ ...@@ -394,7 +388,7 @@
<Configuration <Configuration
Name="PGUpdate|Win32" Name="PGUpdate|Win32"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\pgupdate.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\pgupdate.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -415,8 +409,7 @@ ...@@ -415,8 +409,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -456,7 +449,7 @@ ...@@ -456,7 +449,7 @@
<Configuration <Configuration
Name="PGUpdate|x64" Name="PGUpdate|x64"
ConfigurationType="2" ConfigurationType="2"
InheritedPropertySheets=".\pyd.vsprops;.\x64.vsprops;.\pgupdate.vsprops" InheritedPropertySheets=".\sqlite3.vsprops;.\x64.vsprops;.\pgupdate.vsprops"
CharacterSet="0" CharacterSet="0"
WholeProgramOptimization="1" WholeProgramOptimization="1"
> >
...@@ -478,8 +471,7 @@ ...@@ -478,8 +471,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.5.9" AdditionalIncludeDirectories=""
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -523,11 +515,11 @@ ...@@ -523,11 +515,11 @@
Name="Header Files" Name="Header Files"
> >
<File <File
RelativePath="..\..\..\sqlite-3.5.9\sqlite3.h" RelativePath="..\..\..\sqlite-3.6.21\sqlite3.h"
> >
</File> </File>
<File <File
RelativePath="..\..\..\sqlite-3.5.9\sqlite3ext.h" RelativePath="..\..\..\sqlite-3.6.21\sqlite3ext.h"
> >
</File> </File>
</Filter> </Filter>
...@@ -535,7 +527,7 @@ ...@@ -535,7 +527,7 @@
Name="Source Files" Name="Source Files"
> >
<File <File
RelativePath="..\..\..\sqlite-3.5.9\sqlite3.c" RelativePath="..\..\..\sqlite-3.6.21\sqlite3.c"
> >
</File> </File>
</Filter> </Filter>
......
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioPropertySheet
ProjectType="Visual C++"
Version="8.00"
Name="sqlite3"
InheritedPropertySheets=".\pyproject.vsprops"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\..\..\sqlite-3.6.21"
PreprocessorDefinitions="SQLITE_API=__declspec(dllexport)"
WarningLevel="1"
/>
</VisualStudioPropertySheet>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment