aboutsummaryrefslogtreecommitdiff
path: root/ports/openssl/make-openssl.bat
diff options
context:
space:
mode:
authoratkawa7 <atkawa7@yahoo.com>2017-06-14 08:29:12 -0700
committeratkawa7 <atkawa7@yahoo.com>2017-06-14 08:29:12 -0700
commitce5ad1ffe1ed0c6351a09b01bc92a2ad258b8f19 (patch)
treeb64edb2fe7d020661b3fe30213eef2a967a60fd3 /ports/openssl/make-openssl.bat
parent0a7fee0e8b0a637c83b9dd55bcb7a85c85779aba (diff)
parentc5ac9898999b712b7bac2fbc497825882d5e9011 (diff)
downloadvcpkg-ce5ad1ffe1ed0c6351a09b01bc92a2ad258b8f19.tar.gz
vcpkg-ce5ad1ffe1ed0c6351a09b01bc92a2ad258b8f19.zip
Merge https://github.com/Microsoft/vcpkg
Diffstat (limited to 'ports/openssl/make-openssl.bat')
-rw-r--r--ports/openssl/make-openssl.bat14
1 files changed, 12 insertions, 2 deletions
diff --git a/ports/openssl/make-openssl.bat b/ports/openssl/make-openssl.bat
index 4c038094d..6f0afdf74 100644
--- a/ports/openssl/make-openssl.bat
+++ b/ports/openssl/make-openssl.bat
@@ -1,10 +1,20 @@
set build=%1
-perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL
+perl Configure no-asm no-hw no-dso VC-WINUNIVERSAL -FS -FIWindows.h
+
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\3.0.0.0\
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\2.0.0.0\
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.FoundationContract\1.0.0.0\
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\4.0.0.0\
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\3.0.0.0\
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\2.0.0.0\
+set LibPath=%LibPath%;%WindowsSdkDir%References\%WindowsSDKLibVersion%Windows.Foundation.UniversalApiContract\1.0.0.0\
call ms\do_winuniversal.bat
-call ms\setVSvars.bat universal10.0%build%
+mkdir inc32\openssl
+jom -j %NUMBER_OF_PROCESSORS% -k -f ms\ntdll.mak
+REM due to a race condition in the build, we need to have a second single-threaded pass.
nmake -f ms\ntdll.mak