Update Windows build for 3.6

This commit is contained in:
Zachary Ware 2015-05-28 17:30:03 -05:00
parent 7a219110e6
commit 41a6a625d4
4 changed files with 707 additions and 707 deletions

View file

@ -39,7 +39,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/export:initexample" AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python35.lib" AdditionalDependencies="odbc32.lib odbccp32.lib python36.lib"
OutputFile=".\Release/example.pyd" OutputFile=".\Release/example.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
@ -105,7 +105,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalOptions="/export:initexample" AdditionalOptions="/export:initexample"
AdditionalDependencies="odbc32.lib odbccp32.lib python35_d.lib" AdditionalDependencies="odbc32.lib odbccp32.lib python36_d.lib"
OutputFile=".\Debug/example_d.pyd" OutputFile=".\Debug/example_d.pyd"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"

View file

@ -304,11 +304,11 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */
their Makefile (other compilers are generally their Makefile (other compilers are generally
taken care of by distutils.) */ taken care of by distutils.) */
# if defined(_DEBUG) # if defined(_DEBUG)
# pragma comment(lib,"python35_d.lib") # pragma comment(lib,"python36_d.lib")
# elif defined(Py_LIMITED_API) # elif defined(Py_LIMITED_API)
# pragma comment(lib,"python3.lib") # pragma comment(lib,"python3.lib")
# else # else
# pragma comment(lib,"python35.lib") # pragma comment(lib,"python36.lib")
# endif /* _DEBUG */ # endif /* _DEBUG */
# endif /* _MSC_VER */ # endif /* _MSC_VER */
# endif /* Py_BUILD_CORE */ # endif /* Py_BUILD_CORE */

File diff suppressed because it is too large Load diff

View file

@ -3,10 +3,10 @@ if not defined HOST_PYTHON (
if %1 EQU Debug ( if %1 EQU Debug (
shift shift
set HOST_PYTHON=python_d.exe set HOST_PYTHON=python_d.exe
if not exist python35_d.dll exit 1 if not exist python36_d.dll exit 1
) ELSE ( ) ELSE (
set HOST_PYTHON=python.exe set HOST_PYTHON=python.exe
if not exist python35.dll exit 1 if not exist python36.dll exit 1
) )
) )
%HOST_PYTHON% prepare_ssl.py %1 %HOST_PYTHON% prepare_ssl.py %1