cppu/util/makefile.mk | 2 cppu/util/purpenvhelper3MSCX.map | 28 python/makefile.mk | 21 python/prj/d.lst | 16 python/python-2.7.14-pcbuild-dir.patch | 10 python/python-2.7.14-pcbuild-no-host-python.patch | 11 python/python-2.7.14-pcbuild-python-path.patch | 11 python/python-2.7.14-pcbuild-subsystem.patch | 20 python/python-2.7.14-pcbuild-win64-target.patch | 60 python/python-2.7.14-pcbuild-win64.patch | 1704 ++++++++++++++++++++++ 10 files changed, 1881 insertions(+), 2 deletions(-)
New commits: commit 6fa014325dac9dba4e1fbb33649d2d90ff45b1d3 Author: Damjan Jovanovic <[email protected]> Date: Thu Mar 8 17:56:54 2018 +0000 Add symbol versions for the Win64 platform necessary to build main/cppu. Patch by: me diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index eac3d26e7580..46ee6ab0650c 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -70,6 +70,8 @@ SHL2TARGET := $(NAMEpurpenv_helper) DEF2NAME := $(SHL2TARGET) .IF "$(GUI)$(COM)"=="WNTGCC" SHL2VERSIONMAP:=uno_purpenvhelper$(COMID).map +.ELIF "$(GUI)$(COM)"=="WNTMSC" +SHL2VERSIONMAP:=$(SHL2TARGET)$(CPU).map .ELIF "$(GUI)"=="OS2" SHL2VERSIONMAP:=uno_purpenvhelperwntgcc.map .ELSE diff --git a/cppu/util/purpenvhelper3MSC.map b/cppu/util/purpenvhelper3MSCI.map similarity index 100% rename from cppu/util/purpenvhelper3MSC.map rename to cppu/util/purpenvhelper3MSCI.map diff --git a/cppu/util/purpenvhelper3MSCX.map b/cppu/util/purpenvhelper3MSCX.map new file mode 100644 index 000000000000..790d10945ac0 --- /dev/null +++ b/cppu/util/purpenvhelper3MSCX.map @@ -0,0 +1,28 @@ +############################################################### +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +############################################################### +UDK_3_0_0 { + global: + ?Environment_initWithEnterable@purpenv@helper@cppu@@YAXPEAU_uno_Environment@@PEAVEnterable@3@@Z + ?createMapping@purpenv@helper@cppu@@YAXPEAPEAU_uno_Mapping@@PEAU_uno_Environment@@1P6AX_NPEAX3PEAU_typelib_TypeDescriptionReference@@PEAU_typelib_MethodParameter@@JPEBU_typelib_TypeDescription@@3QEAPEAXPEAPEAU_uno_Any@@@Z3@Z + + local: + *; +}; commit f959de1284e4c316fdb6049cf521f977abb87cf6 Author: Damjan Jovanovic <[email protected]> Date: Thu Mar 8 17:55:13 2018 +0000 Get main/python to build on Win64. Adjust which files get delivered. Patch by: me diff --git a/python/makefile.mk b/python/makefile.mk index 14994b5608e5..337be7265957 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -50,8 +50,21 @@ PATCH_FILES=\ python-ssl.patch \ python-solver-before-std.patch \ python-$(PYVERSION)-sysbase.patch \ - python-$(PYVERSION)-nohardlink.patch \ - python-$(PYVERSION)-pcbuild.patch + python-$(PYVERSION)-nohardlink.patch + +.IF "$(GUI)"=="WNT" +.IF "$(CPUNAME)"=="INTEL" +PATCH_FILES += python-$(PYVERSION)-pcbuild.patch +.ELIF "$(CPUNAME)"=="X86_64" +PATCH_FILES += \ + python-$(PYVERSION)-pcbuild-win64.patch \ + python-$(PYVERSION)-pcbuild-win64-target.patch \ + python-$(PYVERSION)-pcbuild-subsystem.patch \ + python-2.7.14-pcbuild-dir.patch \ + python-2.7.14-pcbuild-no-host-python.patch \ + python-2.7.14-pcbuild-python-path.patch +.ENDIF +.ENDIF CONFIGURE_DIR= @@ -116,7 +129,11 @@ BUILD_DIR=PC/VS9.0 # Build python executable and then runs a minimal script. Running the minimal script # ensures that certain *.pyc files are generated which would otherwise be created on # solver during registration in insetoo_native +.IF "$(CPUNAME)"=="INTEL" BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|Win32" +.ELIF "$(CPUNAME)"=="X86_64" +BUILD_ACTION=$(COMPATH)$/vcpackages$/vcbuild.exe -useenv pcbuild.sln "Release|x64" +.ENDIF .ENDIF .ENDIF diff --git a/python/prj/d.lst b/python/prj/d.lst index 99571b8f2733..d423579a4878 100644 --- a/python/prj/d.lst +++ b/python/prj/d.lst @@ -110,5 +110,21 @@ symlink: %_DEST%\lib%_EXT%\libpython2.7.so.1.0 %_DEST%\lib%_EXT%\libpython2.7.so ..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd ..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd +# Win64 ONLY! +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\python.exe %_DEST%\bin%_EXT%\python.exe +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\python27.dll %_DEST%\bin%_EXT%\python27.dll +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\python27.lib %_DEST%\lib%_EXT%\python27.lib +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_socket.pyd %_DEST%\lib%_EXT%\python\_socket.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_ssl.pyd %_DEST%\lib%_EXT%\python\_ssl.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\select.pyd %_DEST%\lib%_EXT%\python\select.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\unicodedata.pyd %_DEST%\lib%_EXT%\python\unicodedata.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\winsound.pyd %_DEST%\lib%_EXT%\python\winsound.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\pyexpat.pyd %_DEST%\lib%_EXT%\python\pyexpat.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_testcapi.pyd %_DEST%\lib%_EXT%\python\_testcapi.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_multiprocessing.pyd %_DEST%\lib%_EXT%\python\_multiprocessing.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_msi.pyd %_DEST%\lib%_EXT%\python\_msi.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_elementtree.pyd %_DEST%\lib%_EXT%\python\_elementtree.pyd +..\%__SRC%\misc\build\Python-2.7.14\PC\VS9.0\amd64\_ctypes.pyd %_DEST%\lib%_EXT%\python\_ctypes.pyd + #linklib: libpython.so.*.*.* diff --git a/python/python-2.7.14-pcbuild-dir.patch b/python/python-2.7.14-pcbuild-dir.patch new file mode 100644 index 000000000000..16be5a493224 --- /dev/null +++ b/python/python-2.7.14-pcbuild-dir.patch @@ -0,0 +1,10 @@ +--- misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:37:03.303029800 +0200 ++++ misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:39:42.007110300 +0200 +@@ -120,6 +120,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ OutputFile="$(SolutionDir)/make_buildinfo.exe" + AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + SubSystem="1" + /> diff --git a/python/python-2.7.14-pcbuild-no-host-python.patch b/python/python-2.7.14-pcbuild-no-host-python.patch new file mode 100644 index 000000000000..7fa0878dd451 --- /dev/null +++ b/python/python-2.7.14-pcbuild-no-host-python.patch @@ -0,0 +1,11 @@ +--- misc/build/Python-2.7.14/PC/VS9.0/x64.vsprops 2017-09-16 19:38:35.000000000 +0200 ++++ misc/build/Python-2.7.14/PC/VS9.0/x64.vsprops 2018-03-08 07:04:52.320860000 +0200 +@@ -15,8 +15,4 @@ + Name="VCLinkerTool" + TargetMachine="17" + /> +- <UserMacro +- Name="PythonExe" +- Value="$(HOST_PYTHON)" +- /> + </VisualStudioPropertySheet> diff --git a/python/python-2.7.14-pcbuild-python-path.patch b/python/python-2.7.14-pcbuild-python-path.patch new file mode 100644 index 000000000000..97b4db0cde20 --- /dev/null +++ b/python/python-2.7.14-pcbuild-python-path.patch @@ -0,0 +1,11 @@ +--- misc/build/Python-2.7.14/PC/VS9.0/pyproject.vsprops 2017-09-16 19:38:35.000000000 +0200 ++++ misc/build/Python-2.7.14/PC/VS9.0/pyproject.vsprops 2018-03-08 07:10:30.002138400 +0200 +@@ -42,7 +42,7 @@ + /> + <UserMacro + Name="PythonExe" +- Value="$(SolutionDir)\python.exe" ++ Value="$(OutDir)\python.exe" + /> + <UserMacro + Name="externalsDir" diff --git a/python/python-2.7.14-pcbuild-subsystem.patch b/python/python-2.7.14-pcbuild-subsystem.patch new file mode 100644 index 000000000000..ac682c5b18f6 --- /dev/null +++ b/python/python-2.7.14-pcbuild-subsystem.patch @@ -0,0 +1,20 @@ +--- misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 05:18:19.659192400 +0200 ++++ misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2018-03-08 06:06:12.776404800 +0200 +@@ -137,6 +137,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ SubSystem="1" + OutputFile="$(SolutionDir)make_versioninfo.exe" + AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> +--- misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:21:48.081999200 +0200 ++++ misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2018-03-08 06:23:02.210741600 +0200 +@@ -121,6 +121,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalOptions="/NXCOMPAT /DYNAMICBASE" ++ SubSystem="1" + /> + <Tool + Name="VCALinkTool" diff --git a/python/python-2.7.14-pcbuild-win64-target.patch b/python/python-2.7.14-pcbuild-win64-target.patch new file mode 100644 index 000000000000..a3162215c592 --- /dev/null +++ b/python/python-2.7.14-pcbuild-win64-target.patch @@ -0,0 +1,60 @@ +--- misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln 2018-03-08 04:58:56.323391400 +0200 ++++ misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln 2018-03-08 05:14:36.079035700 +0200 +@@ -162,20 +162,20 @@ + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 + {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32 +- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64 ++ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 +@@ -226,20 +226,20 @@ + {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 + {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32 +- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64 ++ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 + {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/python/python-2.7.14-pcbuild-win64.patch b/python/python-2.7.14-pcbuild-win64.patch new file mode 100644 index 000000000000..23460b25f25d --- /dev/null +++ b/python/python-2.7.14-pcbuild-win64.patch @@ -0,0 +1,1704 @@ +diff -urp misc/Python-2.7.14/PC/VS9.0/_bsddb.vcproj misc/build/Python-2.7.14/PC/VS9.0/_bsddb.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_bsddb.vcproj 2017-10-21 17:56:40.218589000 -0500 +@@ -56,6 +56,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + /> +@@ -120,6 +121,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + /> +@@ -183,6 +185,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + /> +@@ -248,6 +251,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + /> +@@ -311,6 +315,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + /> +@@ -375,6 +380,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + TargetMachine="17" +@@ -439,6 +445,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + /> +@@ -503,6 +510,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + AdditionalDependencies="$(bsddbDepLibs)" + BaseAddress="0x1e180000" + TargetMachine="17" +diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes.vcproj misc/build/Python-2.7.14/PC/VS9.0/_ctypes.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_ctypes.vcproj 2017-10-21 17:56:40.219465000 -0500 +@@ -177,7 +177,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" ++ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + /> +@@ -241,7 +241,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" ++ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + /> +@@ -304,7 +304,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" ++ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + /> +@@ -368,7 +368,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" ++ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + TargetMachine="17" +@@ -432,7 +432,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" ++ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + /> +@@ -496,7 +496,7 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalOptions="/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" ++ AdditionalOptions="/DYNAMICBASE /NXCOMPAT /EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE" + SubSystem="0" + BaseAddress="0x1D1A0000" + TargetMachine="17" +diff -urp misc/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj misc/build/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_ctypes_test.vcproj 2017-10-21 17:56:40.220226000 -0500 +@@ -54,6 +54,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -113,6 +114,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -172,6 +174,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -232,6 +235,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -291,6 +295,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -352,6 +357,7 @@ + <Tool + Name="VCLinkerTool" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -411,6 +417,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -472,6 +479,7 @@ + <Tool + Name="VCLinkerTool" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_elementtree.vcproj misc/build/Python-2.7.14/PC/VS9.0/_elementtree.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_elementtree.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_elementtree.vcproj 2017-10-21 17:56:40.221003000 -0500 +@@ -57,6 +57,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D100000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -119,6 +120,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D100000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -181,6 +183,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D100000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -244,6 +247,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D100000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -306,6 +310,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D100000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -370,6 +375,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1D100000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -432,6 +438,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D100000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -496,6 +503,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1D100000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_hashlib.vcproj misc/build/Python-2.7.14/PC/VS9.0/_hashlib.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_hashlib.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_hashlib.vcproj 2017-10-21 17:56:40.222221000 -0500 +@@ -58,6 +58,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -121,6 +122,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -184,6 +186,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -248,6 +251,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -311,6 +315,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -376,6 +381,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -439,6 +445,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -504,6 +511,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_msi.vcproj misc/build/Python-2.7.14/PC/VS9.0/_msi.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_msi.vcproj 2017-10-21 17:56:40.223291000 -0500 +@@ -56,6 +56,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -117,6 +118,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -178,6 +180,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -240,6 +243,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -301,6 +305,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -364,6 +369,7 @@ + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -425,6 +431,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -488,6 +495,7 @@ + AdditionalDependencies="fci.lib msi.lib rpcrt4.lib" + BaseAddress="0x1D160000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_multiprocessing.vcproj 2017-10-21 17:56:40.224316000 -0500 +@@ -56,6 +56,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -117,6 +118,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -178,6 +180,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -240,6 +243,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -301,6 +305,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -364,6 +369,7 @@ + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -425,6 +431,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -488,6 +495,7 @@ + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_socket.vcproj misc/build/Python-2.7.14/PC/VS9.0/_socket.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_socket.vcproj 2017-10-21 17:56:40.225407000 -0500 +@@ -56,6 +56,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -117,6 +118,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -178,6 +180,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -240,6 +243,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -301,6 +305,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -364,6 +369,7 @@ + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -425,6 +431,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -488,6 +495,7 @@ + AdditionalDependencies="ws2_32.lib" + BaseAddress="0x1e1D0000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj misc/build/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_sqlite3.vcproj 2017-10-21 17:56:40.226403000 -0500 +@@ -57,6 +57,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e180000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -119,6 +120,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e180000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -181,6 +183,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e180000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -244,6 +247,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e180000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -306,6 +310,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e180000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -370,6 +375,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1e180000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -432,6 +438,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e180000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -496,6 +503,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1e180000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_ssl.vcproj misc/build/Python-2.7.14/PC/VS9.0/_ssl.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_ssl.vcproj 2017-10-21 17:56:40.227504000 -0500 +@@ -43,7 +43,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\include32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -57,7 +57,8 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -106,7 +107,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\include64" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -120,7 +121,8 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -169,7 +171,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\include32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -183,7 +185,8 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -233,7 +236,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\include64" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -247,7 +250,8 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" + /> + <Tool + Name="VCALinkTool" +@@ -296,7 +300,7 @@ + /> + <Tool + Name="VCCLCompilerTool" +- AdditionalIncludeDirectories="$(opensslDir)\include32" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + /> + <Tool + Name="VCManagedResourceCompilerTool" +@@ -310,7 +314,8 @@ + /> + <Tool + Name="VCLinkerTool" +- AdditionalDependencies="ws2_32.lib crypt32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" ++ AdditionalDependencies="ws2_32.lib crypt32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_testcapi.vcproj misc/build/Python-2.7.14/PC/VS9.0/_testcapi.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_testcapi.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_testcapi.vcproj 2017-10-21 17:56:40.228516000 -0500 +@@ -55,6 +55,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -115,6 +116,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -175,6 +177,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -236,6 +239,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -296,6 +300,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -358,6 +363,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -418,6 +424,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -480,6 +487,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1e1F0000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/_tkinter.vcproj misc/build/Python-2.7.14/PC/VS9.0/_tkinter.vcproj +--- misc/Python-2.7.14/PC/VS9.0/_tkinter.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/_tkinter.vcproj 2017-10-21 17:56:40.229664000 -0500 +@@ -57,6 +57,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltkLibDebug)" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -119,6 +120,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64LibDebug)" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -181,6 +183,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltkLib)" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -244,6 +247,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -306,6 +310,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltkLib)" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -370,6 +375,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -432,6 +438,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="$(tcltkLib)" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -496,6 +503,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="$(tcltk64Lib)" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj +--- misc/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/bdist_wininst.vcproj 2017-10-21 17:56:40.230806000 -0500 +@@ -81,8 +81,7 @@ + IgnoreDefaultLibraryNames="LIBC" + ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb" + SubSystem="2" +- RandomizedBaseAddress="1" +- DataExecutionPrevention="0" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + TargetMachine="1" + /> + <Tool +@@ -171,8 +170,7 @@ + IgnoreDefaultLibraryNames="LIBC" + ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb" + SubSystem="2" +- RandomizedBaseAddress="1" +- DataExecutionPrevention="0" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + TargetMachine="17" + /> + <Tool +diff -urp misc/Python-2.7.14/PC/VS9.0/bz2.vcproj misc/build/Python-2.7.14/PC/VS9.0/bz2.vcproj +--- misc/Python-2.7.14/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/bz2.vcproj 2017-10-21 17:56:40.232092000 -0500 +@@ -57,6 +57,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D170000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -119,6 +120,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D170000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -181,6 +183,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D170000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -244,6 +247,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D170000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -306,6 +310,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D170000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -370,6 +375,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1D170000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -432,6 +438,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D170000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -496,6 +503,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1D170000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/kill_python.vcproj misc/build/Python-2.7.14/PC/VS9.0/kill_python.vcproj +--- misc/Python-2.7.14/PC/VS9.0/kill_python.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/kill_python.vcproj 2017-10-21 17:56:40.233109000 -0500 +@@ -56,6 +56,7 @@ + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)_d.exe" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -117,6 +118,7 @@ + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)_d.exe" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -177,6 +179,7 @@ + <Tool + Name="VCLinkerTool" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -238,6 +241,7 @@ + <Tool + Name="VCLinkerTool" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj +--- misc/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/make_buildinfo.vcproj 2017-10-21 17:56:40.233689000 -0500 +@@ -61,6 +61,7 @@ + OutputFile="$(OutDir)/make_buildinfo.exe" + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -119,6 +120,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj +--- misc/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/make_versioninfo.vcproj 2017-10-21 17:56:40.234324000 -0500 +@@ -71,6 +71,7 @@ + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -137,6 +138,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(SolutionDir)make_versioninfo.exe" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -214,6 +216,7 @@ + ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" + SubSystem="1" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -282,6 +285,7 @@ + Name="VCLinkerTool" + OutputFile="$(SolutionDir)make_versioninfo_d.exe" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/pcbuild.sln misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln +--- misc/Python-2.7.14/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/pcbuild.sln 2017-10-21 17:56:40.235608000 -0500 +@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" +- ProjectSection(ProjectDependencies) = postProject +- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bsddb", "_bsddb.vcproj", "{B4D38F3F-68FB-42EC-A45D-E00657BB3627}" ++# ProjectSection(ProjectDependencies) = postProject ++# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes", "_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +@@ -69,12 +69,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" + ProjectSection(ProjectDependencies) = postProject + {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +@@ -87,16 +87,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9 + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} + EndProjectSection + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" +- ProjectSection(ProjectDependencies) = postProject +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bz2", "bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" ++# ProjectSection(ProjectDependencies) = postProject ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +@@ -114,17 +114,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9 + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" + EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" +- ProjectSection(ProjectDependencies) = postProject +- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} +- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" +- ProjectSection(ProjectDependencies) = postProject +- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} +- EndProjectSection +-EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" ++# ProjectSection(ProjectDependencies) = postProject ++# {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} ++# {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} ++# EndProjectSection ++#EndProject ++#Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" ++# ProjectSection(ProjectDependencies) = postProject ++# {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} ++# EndProjectSection ++#EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" + ProjectSection(ProjectDependencies) = postProject + {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} +diff -urp misc/Python-2.7.14/PC/VS9.0/pyexpat.vcproj misc/build/Python-2.7.14/PC/VS9.0/pyexpat.vcproj +--- misc/Python-2.7.14/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/pyexpat.vcproj 2017-10-21 17:56:40.236395000 -0500 +@@ -56,6 +56,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -117,6 +118,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -178,6 +180,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -240,6 +243,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -301,6 +305,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -364,6 +369,7 @@ + <Tool + Name="VCLinkerTool" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -425,6 +431,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -488,6 +495,7 @@ + <Tool + Name="VCLinkerTool" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/python.vcproj misc/build/Python-2.7.14/PC/VS9.0/python.vcproj +--- misc/Python-2.7.14/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/python.vcproj 2017-10-21 17:56:40.237211000 -0500 +@@ -66,6 +66,7 @@ + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -139,6 +140,7 @@ + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -213,6 +215,7 @@ + SubSystem="1" + StackReserveSize="2000000" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -288,6 +291,7 @@ + SubSystem="1" + StackReserveSize="2100000" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -361,6 +365,7 @@ + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -436,6 +441,7 @@ + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -509,6 +515,7 @@ + StackReserveSize="2000000" + BaseAddress="0x1d000000" + ImportLibrary="" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -584,6 +591,7 @@ + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/pythoncore.vcproj misc/build/Python-2.7.14/PC/VS9.0/pythoncore.vcproj +--- misc/Python-2.7.14/PC/VS9.0/pythoncore.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/pythoncore.vcproj 2017-10-21 17:56:40.238551000 -0500 +@@ -69,6 +69,7 @@ + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName).lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -144,6 +145,7 @@ + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName).lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -222,6 +224,7 @@ + ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName)_d.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -300,6 +303,7 @@ + ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDir)$(PyDllName)_d.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -374,6 +378,7 @@ + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -450,6 +455,7 @@ + BaseAddress="0x1e000000" + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -524,6 +530,7 @@ + ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb" + BaseAddress="0x1e000000" + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -600,6 +607,7 @@ + BaseAddress="0x1e000000" + ImportLibrary="$(OutDirPGI)$(PyDllName).lib" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/pythonw.vcproj misc/build/Python-2.7.14/PC/VS9.0/pythonw.vcproj +--- misc/Python-2.7.14/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/pythonw.vcproj 2017-10-21 17:56:40.239382000 -0500 +@@ -66,6 +66,7 @@ + StackReserveSize="2000000" + BaseAddress="0x1d000000" + TargetMachine="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -137,6 +138,7 @@ + OutputFile="$(OutDir)\pythonw_d.exe" + StackReserveSize="2000000" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -208,6 +210,7 @@ + StackReserveSize="2000000" + BaseAddress="0x1d000000" + TargetMachine="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -279,6 +282,7 @@ + OutputFile="$(OutDir)\pythonw.exe" + StackReserveSize="2000000" + BaseAddress="0x1d000000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -351,6 +355,7 @@ + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -424,6 +429,7 @@ + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -496,6 +502,7 @@ + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -569,6 +576,7 @@ + BaseAddress="0x1d000000" + ImportLibrary="" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/select.vcproj misc/build/Python-2.7.14/PC/VS9.0/select.vcproj +--- misc/Python-2.7.14/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/select.vcproj 2017-10-21 17:56:40.240210000 -0500 +@@ -57,6 +57,7 @@ + AdditionalDependencies="ws2_32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -119,6 +120,7 @@ + AdditionalDependencies="ws2_32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -181,6 +183,7 @@ + AdditionalDependencies="ws2_32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -244,6 +247,7 @@ + AdditionalDependencies="ws2_32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -306,6 +310,7 @@ + AdditionalDependencies="ws2_32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -370,6 +375,7 @@ + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -432,6 +438,7 @@ + AdditionalDependencies="ws2_32.lib" + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -496,6 +503,7 @@ + IgnoreDefaultLibraryNames="libc" + BaseAddress="0x1D110000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/sqlite3.vcproj misc/build/Python-2.7.14/PC/VS9.0/sqlite3.vcproj +--- misc/Python-2.7.14/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/sqlite3.vcproj 2017-10-21 17:56:40.241775000 -0500 +@@ -56,6 +56,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)_d.dll" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -117,6 +118,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)_d.dll" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -178,6 +180,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).dll" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -240,6 +243,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).dll" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -301,6 +305,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).dll" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -362,6 +367,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -423,6 +429,7 @@ + <Tool + Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName).dll" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -484,6 +491,7 @@ + /> + <Tool + Name="VCLinkerTool" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.14/PC/VS9.0/unicodedata.vcproj +--- misc/Python-2.7.14/PC/VS9.0/unicodedata.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/unicodedata.vcproj 2017-10-21 17:56:40.242820000 -0500 +@@ -55,6 +55,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -115,6 +116,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -175,6 +177,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -236,6 +239,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -296,6 +300,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -358,6 +363,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1D120000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -418,6 +424,7 @@ + <Tool + Name="VCLinkerTool" + BaseAddress="0x1D120000" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -480,6 +487,7 @@ + Name="VCLinkerTool" + BaseAddress="0x1D120000" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj misc/build/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj +--- misc/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/w9xpopen.vcproj 2017-10-21 17:56:40.243805000 -0500 +@@ -59,6 +59,7 @@ + <Tool + Name="VCLinkerTool" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -124,6 +125,7 @@ + <Tool + Name="VCLinkerTool" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -191,6 +193,7 @@ + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -259,6 +262,7 @@ + Name="VCLinkerTool" + GenerateDebugInformation="false" + SubSystem="1" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -327,6 +331,7 @@ + GenerateDebugInformation="false" + SubSystem="1" + ImportLibrary="" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -397,6 +402,7 @@ + SubSystem="1" + ImportLibrary="" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -465,6 +471,7 @@ + GenerateDebugInformation="false" + SubSystem="1" + ImportLibrary="" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -535,6 +542,7 @@ + SubSystem="1" + ImportLibrary="" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +diff -urp misc/Python-2.7.14/PC/VS9.0/winsound.vcproj misc/build/Python-2.7.14/PC/VS9.0/winsound.vcproj +--- misc/Python-2.7.14/PC/VS9.0/winsound.vcproj 2017-09-16 12:38:35.000000000 -0500 ++++ misc/build/Python-2.7.14/PC/VS9.0/winsound.vcproj 2017-10-21 17:56:40.244677000 -0500 +@@ -55,6 +55,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -115,6 +116,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -175,6 +177,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -236,6 +239,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -296,6 +300,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -358,6 +363,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -418,6 +424,7 @@ + <Tool + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" +@@ -480,6 +487,7 @@ + Name="VCLinkerTool" + AdditionalDependencies="winmm.lib" + TargetMachine="17" ++ AdditionalOptions="/NXCOMPAT /DYNAMICBASE" + /> + <Tool + Name="VCALinkTool" _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
