diff --git a/PC/bdist_wininst/bdist_wininst.vcxproj b/PC/bdist_wininst/bdist_wininst.vcxproj index 7971dc760e..4dc5009b58 100644 --- a/PC/bdist_wininst/bdist_wininst.vcxproj +++ b/PC/bdist_wininst/bdist_wininst.vcxproj @@ -37,7 +37,6 @@ {EB1C19C1-1F18-421E-9735-CAEE69DC6A3C} wininst - ClCompile false diff --git a/PC/python_ver_rc.h b/PC/python_ver_rc.h index 8ad18ef78f..8ce03fe18b 100644 --- a/PC/python_ver_rc.h +++ b/PC/python_ver_rc.h @@ -10,10 +10,10 @@ #include "modsupport.h" #include "patchlevel.h" #ifdef _DEBUG -# include "pythonnt_rc_d.h" +# include # define PYTHON_DEBUG_EXT "_d" #else -# include "pythonnt_rc.h" +# include # define PYTHON_DEBUG_EXT #endif diff --git a/PC/sqlite3.rc b/PC/sqlite3.rc new file mode 100644 index 0000000000..84bd87d9d5 --- /dev/null +++ b/PC/sqlite3.rc @@ -0,0 +1,49 @@ +// Resource script for Sqlite DLL. + +#include + +// Include the manifest file that indicates we support all +// current versions of Windows. +#include +2 RT_MANIFEST "python.manifest" + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#define _S(x) #x +#define S(x) _S(x) + +VS_VERSION_INFO VERSIONINFO + FILEVERSION SQLITE_MAJOR_VERSION, SQLITE_MINOR_VERSION, SQLITE_MICRO_VERSION, SQLITE_PATCH_VERSION + PRODUCTVERSION SQLITE_MAJOR_VERSION, SQLITE_MINOR_VERSION, SQLITE_MICRO_VERSION, SQLITE_PATCH_VERSION + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", "SQLite3\0" + VALUE "FileDescription", "SQLite3\0" + VALUE "FileVersion", S(SQLITE_VERSION) "\0" + VALUE "InternalName", "SQLite3 DLL\0" + VALUE "LegalCopyright", "Unspecified\0" + VALUE "OriginalFilename", "sqlite3.dll\0" + VALUE "ProductName", "SQLite3\0" + VALUE "ProductVersion", S(SQLITE_VERSION) "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END diff --git a/PCbuild/_bz2.vcxproj b/PCbuild/_bz2.vcxproj index 64c3dcde14..9efb0d9a79 100644 --- a/PCbuild/_bz2.vcxproj +++ b/PCbuild/_bz2.vcxproj @@ -83,6 +83,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_ctypes.vcxproj b/PCbuild/_ctypes.vcxproj index 68b8e2971d..70bea457d2 100644 --- a/PCbuild/_ctypes.vcxproj +++ b/PCbuild/_ctypes.vcxproj @@ -96,6 +96,9 @@ $(IntDir)win64.obj;%(Outputs) + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_ctypes_test.vcxproj b/PCbuild/_ctypes_test.vcxproj index c1260b53f3..b62407fadf 100644 --- a/PCbuild/_ctypes_test.vcxproj +++ b/PCbuild/_ctypes_test.vcxproj @@ -66,6 +66,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_decimal.vcxproj b/PCbuild/_decimal.vcxproj index 943bfb0990..9c9c19abbe 100644 --- a/PCbuild/_decimal.vcxproj +++ b/PCbuild/_decimal.vcxproj @@ -113,6 +113,9 @@ $(IntDir)vcdiv64.obj;%(Outputs) + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_elementtree.vcxproj b/PCbuild/_elementtree.vcxproj index 414bd8bebb..725b5a967b 100644 --- a/PCbuild/_elementtree.vcxproj +++ b/PCbuild/_elementtree.vcxproj @@ -91,6 +91,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_hashlib.vcxproj b/PCbuild/_hashlib.vcxproj index 5616a1e4ca..b1300cb8c9 100644 --- a/PCbuild/_hashlib.vcxproj +++ b/PCbuild/_hashlib.vcxproj @@ -70,6 +70,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_lzma.vcxproj b/PCbuild/_lzma.vcxproj index af50494ebd..1f0696da82 100644 --- a/PCbuild/_lzma.vcxproj +++ b/PCbuild/_lzma.vcxproj @@ -73,6 +73,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_msi.vcxproj b/PCbuild/_msi.vcxproj index f5ba7bff76..3895d450f3 100644 --- a/PCbuild/_msi.vcxproj +++ b/PCbuild/_msi.vcxproj @@ -68,6 +68,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_multiprocessing.vcxproj b/PCbuild/_multiprocessing.vcxproj index 1eb92b67dc..bb2bb4114c 100644 --- a/PCbuild/_multiprocessing.vcxproj +++ b/PCbuild/_multiprocessing.vcxproj @@ -72,6 +72,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_overlapped.vcxproj b/PCbuild/_overlapped.vcxproj index 55301ea9dc..8cf8a8677b 100644 --- a/PCbuild/_overlapped.vcxproj +++ b/PCbuild/_overlapped.vcxproj @@ -68,6 +68,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_socket.vcxproj b/PCbuild/_socket.vcxproj index 03b6f7558e..d5c4d1b5b6 100644 --- a/PCbuild/_socket.vcxproj +++ b/PCbuild/_socket.vcxproj @@ -71,6 +71,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_sqlite3.vcxproj b/PCbuild/_sqlite3.vcxproj index 5e889d0de0..5456bb5b23 100644 --- a/PCbuild/_sqlite3.vcxproj +++ b/PCbuild/_sqlite3.vcxproj @@ -90,6 +90,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_ssl.vcxproj b/PCbuild/_ssl.vcxproj index 73c95713a0..d75ebd656a 100644 --- a/PCbuild/_ssl.vcxproj +++ b/PCbuild/_ssl.vcxproj @@ -70,6 +70,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_testbuffer.vcxproj b/PCbuild/_testbuffer.vcxproj index 8cbf1251c3..1f45b29810 100644 --- a/PCbuild/_testbuffer.vcxproj +++ b/PCbuild/_testbuffer.vcxproj @@ -68,6 +68,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_testcapi.vcxproj b/PCbuild/_testcapi.vcxproj index dbf44e6e94..365b07c5c5 100644 --- a/PCbuild/_testcapi.vcxproj +++ b/PCbuild/_testcapi.vcxproj @@ -68,6 +68,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_testembed.vcxproj b/PCbuild/_testembed.vcxproj index f0e4d9f874..14a926e945 100644 --- a/PCbuild/_testembed.vcxproj +++ b/PCbuild/_testembed.vcxproj @@ -65,6 +65,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_testimportmultiple.vcxproj b/PCbuild/_testimportmultiple.vcxproj index cec042c202..37c1a64ac8 100644 --- a/PCbuild/_testimportmultiple.vcxproj +++ b/PCbuild/_testimportmultiple.vcxproj @@ -68,6 +68,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_testmultiphase.vcxproj b/PCbuild/_testmultiphase.vcxproj index 647b38029d..106927c67b 100644 --- a/PCbuild/_testmultiphase.vcxproj +++ b/PCbuild/_testmultiphase.vcxproj @@ -68,6 +68,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/_tkinter.vcxproj b/PCbuild/_tkinter.vcxproj index f3185eb28b..67931067d3 100644 --- a/PCbuild/_tkinter.vcxproj +++ b/PCbuild/_tkinter.vcxproj @@ -73,6 +73,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/pyexpat.vcxproj b/PCbuild/pyexpat.vcxproj index 4e7621ec92..99c7286b2b 100644 --- a/PCbuild/pyexpat.vcxproj +++ b/PCbuild/pyexpat.vcxproj @@ -72,6 +72,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj index 6a2178583e..2d4b5f6445 100644 --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -38,7 +38,6 @@ {7B2727B5-5A3F-40EE-A866-43A13CD31446} pylauncher py - ClCompile false diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 7033cc3b7d..c56292ab5e 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -75,7 +75,7 @@ true - $(PySourcePath)PC;$(PySourcePath)Include;%(AdditionalIncludeDirectories) + $(PySourcePath)PC;$(PySourcePath)Include;$(IntDir);%(AdditionalIncludeDirectories) $(_DebugPreprocessorDefinition)%(PreprocessorDefinitions) 0x0409 @@ -92,17 +92,17 @@ - - + diff --git a/PCbuild/python.vcxproj b/PCbuild/python.vcxproj index 0ae4882ad1..f9580be9bf 100644 --- a/PCbuild/python.vcxproj +++ b/PCbuild/python.vcxproj @@ -36,7 +36,6 @@ {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} - ClCompile diff --git a/PCbuild/python3dll.vcxproj b/PCbuild/python3dll.vcxproj index 18ff4a83e9..cbb618f283 100644 --- a/PCbuild/python3dll.vcxproj +++ b/PCbuild/python3dll.vcxproj @@ -39,7 +39,6 @@ python3dll Win32Proj python3 - ClCompile false diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj index 9cbe8b9384..3a1b5ba8be 100644 --- a/PCbuild/pythoncore.vcxproj +++ b/PCbuild/pythoncore.vcxproj @@ -48,7 +48,6 @@ - ClCompile true diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj index b0a209af42..caed1e8dcf 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -36,7 +36,6 @@ {F4229CC3-873C-49AE-9729-DD308ED4CD4A} - ClCompile false diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj index 882f1c4d24..eabf883a4a 100644 --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -38,7 +38,6 @@ {1D4B18D3-7C12-4ECB-9179-8531FF876CE6} pywlauncher pyw - ClCompile false diff --git a/PCbuild/select.vcxproj b/PCbuild/select.vcxproj index 3cd0694baa..d6112ab6fe 100644 --- a/PCbuild/select.vcxproj +++ b/PCbuild/select.vcxproj @@ -67,6 +67,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/sqlite3.vcxproj b/PCbuild/sqlite3.vcxproj index b6246fa78c..c841c5a8ea 100644 --- a/PCbuild/sqlite3.vcxproj +++ b/PCbuild/sqlite3.vcxproj @@ -56,6 +56,12 @@ <_ProjectFileVersion>10.0.30319.1 + <_SqliteVersion>$([System.Text.RegularExpressions.Regex]::Match(`$(sqlite3Dir)`, `((\d+)\.(\d+)\.(\d+)\.(\d+))\\?$`).Groups) + $(_SqliteVersion.Split(`;`)[1]) + $(_SqliteVersion.Split(`;`)[2]) + $(_SqliteVersion.Split(`;`)[3]) + $(_SqliteVersion.Split(`;`)[4]) + $(_SqliteVersion.Split(`;`)[5]) @@ -63,6 +69,9 @@ SQLITE_API=__declspec(dllexport);%(PreprocessorDefinitions) Level1 + + SQLITE_VERSION=$(SqliteVersion);SQLITE_MAJOR_VERSION=$(SqliteMajorVersion);SQLITE_MINOR_VERSION=$(SqliteMinorVersion);SQLITE_MICRO_VERSION=$(SqliteMicroVersion);SQLITE_PATCH_VERSION=$(SqlitePatchVersion);%(PreprocessorDefinitions) + @@ -71,6 +80,9 @@ + + + diff --git a/PCbuild/unicodedata.vcxproj b/PCbuild/unicodedata.vcxproj index a3071fbf8e..317c1a8a56 100644 --- a/PCbuild/unicodedata.vcxproj +++ b/PCbuild/unicodedata.vcxproj @@ -71,6 +71,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26} diff --git a/PCbuild/winsound.vcxproj b/PCbuild/winsound.vcxproj index 540235af22..12913efdef 100644 --- a/PCbuild/winsound.vcxproj +++ b/PCbuild/winsound.vcxproj @@ -67,6 +67,9 @@ + + + {cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}