More work on Windows 10 SDK integration.

FossilOrigin-Name: ebace2c99b6af9230c4bbc31a764c7f397200148

diff --git a/Makefile.msc b/Makefile.msc
index 3427b8177a406c5dac61a7db44db1b35fbacc435..a507825a20ac8934ff783c16b809f82b9d40e40e 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -356,6 +356,16 @@ NSDKLIBPATH = $(WINDOWSSDKDIR)\lib
 
 NSDKLIBPATH = $(NSDKLIBPATH:\\=\)
 
+# Check for the UCRT library path macro.  Othertise, this value will
+# default to the version-specific, platform-specific 'lib' directory
+# underneath the Windows SDK installation directory.
+#
+!IFNDEF UCRTLIBPATH
+UCRTLIBPATH = $(WINDOWSSDKDIR)\lib\$(WINDOWSSDKLIBVERSION)\ucrt\$(PLATFORM)
+!ENDIF
+
+UCRTLIBPATH = $(UCRTLIBPATH:\\=\)
+
 # C compiler and options for use in building executables that
 # will run on the platform that is doing the build.
 #
@@ -541,7 +551,7 @@ BCC = $(BCC) /guard:cf -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
 # USE_CRT_DLL option is set to force dynamically linking to the
 # MSVC runtime library.
 #
-!IF $(FOR_WINRT)!=0 || $(FOR_WIN10)!=0 || $(USE_CRT_DLL)!=0
+!IF $(FOR_WINRT)!=0 || $(USE_CRT_DLL)!=0
 !IF $(DEBUG)>1
 TCC = $(TCC) -MDd
 BCC = $(BCC) -MDd
@@ -888,7 +898,8 @@ LTLINKOPTS = $(LTLINKOPTS) WindowsPhoneCore.lib RuntimeObject.lib PhoneAppModelH
 LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:kernel32.lib /NODEFAULTLIB:ole32.lib
 !ENDIF
 
-# When compiling for UAP, some extra linker options are also required.
+# When compiling for UAP or the Windows 10 platform, some extra
+# linker options are also required.
 #
 !IF $(FOR_UAP)!=0 || $(FOR_WIN10)!=0
 LTLINKOPTS = $(LTLINKOPTS) /DYNAMICBASE /NODEFAULTLIB:kernel32.lib
@@ -898,6 +909,15 @@ LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(PSDKLIBPATH)"
 !ENDIF
 !ENDIF
 
+!IF $(FOR_WIN10)!=0
+LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(UCRTLIBPATH)"
+!IF $(DEBUG)>1
+LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:libucrtd.lib /DEFAULTLIB:ucrtd.lib
+!ELSE
+LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib
+!ENDIF
+!ENDIF
+
 # If either debugging or symbols are enabled, enable PDBs.
 #
 !IF $(DEBUG)>1 || $(SYMBOLS)!=0

diff --git a/manifest b/manifest
index 76600b81905c16c3e887f7ce3314e8075f9988f5..c8a0a95df09946072a3fc9c900e8e3cccc4a07c6 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
-C Further\sstreamlining\sof\sfts5\sprefix\squery\scode.
-D 2016-02-05T19:18:02.811
+C More\swork\son\sWindows\s10\sSDK\sintegration.
+D 2016-02-05T19:40:23.877
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
-F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
+F Makefile.msc 9eadde083c1ef0d0d2a253671c76e0b7e48a3dc6
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
 F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -1426,7 +1426,10 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 1cac6c45eeb7dbbcda0c76ba7d3a2ca77bc725cd
-R 82ed27d217d52be944f2d4bee3dfe639
-U dan
-Z ad1bc1867d7f59ff72d365283a40efbf
+P ca91bd8ac70a5b3fef127364f73ec675e58bb92c
+R 1ddcbe680d5a6ea9a1dc01ec422c820c
+T *branch * win10sdk
+T *sym-win10sdk *
+T -sym-trunk *
+U mistachkin
+Z 9a5014635472c911640e985821bf4dea

diff --git a/manifest.uuid b/manifest.uuid
index 8902cb7ad95588fe64d78c55cbf6ae0daac578dd..bf7c81653a705610c45b58684166d2bad2479f35 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ca91bd8ac70a5b3fef127364f73ec675e58bb92c
\ No newline at end of file
+ebace2c99b6af9230c4bbc31a764c7f397200148
\ No newline at end of file