From: mistachkin <mistachkin@noemail.net>
Date: Mon, 8 Feb 2016 20:40:57 +0000 (+0000)
Subject: More work on Windows 10 SDK integration.
X-Git-Tag: version-3.11.0~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55e88d96ed418592c71455698bd1dee4406d72e0;p=thirdparty%2Fsqlite.git

More work on Windows 10 SDK integration.

FossilOrigin-Name: 1e563c6ebbb02d2e89760c7a7f95aa69964629c6
---

55e88d96ed418592c71455698bd1dee4406d72e0
diff --cc Makefile.msc
index aacacbcec3,a507825a20..8d416b77cb
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -267,6 -267,6 +267,15 @@@ EXT_FEATURE_FLAGS 
  ############################### END OF OPTIONS ################################
  ###############################################################################
  
++# When compiling for the Windows 10 platform, the PLATFORM macro must be set
++# to an appropriate value (e.g. x86, x64, arm, arm64, etc).
++#
++!IF $(FOR_WIN10)!=0
++!IFNDEF PLATFORM
++!ERROR Using the FOR_WIN10 option requires a value for PLATFORM.
++!ENDIF
++!ENDIF
++
  # This assumes that MSVC is always installed in 32-bit Program Files directory
  # and sets the variable for use in locating other 32-bit installs accordingly.
  #
@@@ -888,7 -898,8 +907,8 @@@ LTLINKOPTS = $(LTLINKOPTS) WindowsPhone
  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.
++# 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
diff --cc autoconf/Makefile.msc
index 598e6517ae,598e6517ae..a4f916f5a7
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@@ -252,6 -252,6 +252,15 @@@ EXT_FEATURE_FLAGS 
  ############################### END OF OPTIONS ################################
  ###############################################################################
  
++# When compiling for the Windows 10 platform, the PLATFORM macro must be set
++# to an appropriate value (e.g. x86, x64, arm, arm64, etc).
++#
++!IF $(FOR_WIN10)!=0
++!IFNDEF PLATFORM
++!ERROR Using the FOR_WIN10 option requires a value for PLATFORM.
++!ENDIF
++!ENDIF
++
  # This assumes that MSVC is always installed in 32-bit Program Files directory
  # and sets the variable for use in locating other 32-bit installs accordingly.
  #
@@@ -341,6 -341,6 +350,16 @@@ NSDKLIBPATH = $(WINDOWSSDKDIR)\li
  
  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.
  #
@@@ -526,7 -526,7 +545,7 @@@ BCC = $(BCC) /guard:cf -D_ARM_WINAPI_PA
  # 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
@@@ -783,7 -783,7 +802,8 @@@ LTLINKOPTS = $(LTLINKOPTS) WindowsPhone
  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
@@@ -793,6 -793,6 +813,15 @@@ LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(
  !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 --cc manifest
index ebec0dd69b,c8a0a95df0..24eebb58a9
--- a/manifest
+++ b/manifest
@@@ -1,8 -1,8 +1,8 @@@
- C Fix\sa\ssigned/unsigned\scomparison\swarning\sin\sfts5.
- D 2016-02-08T20:14:41.915
+ C More\swork\son\sWindows\s10\sSDK\sintegration.
 -D 2016-02-05T19:40:23.877
 -F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
++D 2016-02-08T20:40:57.726
 +F Makefile.in dac2776c84e0d533b158a9af6e57e05c4a6b19f3
  F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
- F Makefile.msc fcf377286d910b47e072da1ac7945976337c0925
 -F Makefile.msc 9eadde083c1ef0d0d2a253671c76e0b7e48a3dc6
++F Makefile.msc 8514a6d7c15fa179b45da902a4ddcf0a8e6748b2
  F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
  F VERSION 866588d1edf0ccb5b0d33896974338f97564f719
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -11,7 -11,7 +11,7 @@@ F art/sqlite370.ico af56c1d00fee7cd4753
  F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
  F autoconf/Makefile.am 1c1657650775960804945dc392e14d9e43c5ed84
--F autoconf/Makefile.msc 2ce3b1565a52d7083a1dbf57a1706fd14cc1ee0c
++F autoconf/Makefile.msc de6d40e0c495d761b9813ccb20a649841f6d6b72
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
  F autoconf/README.txt e9757a381e5ce2553dbaa6247bb8ad00eb8d87aa
  F autoconf/configure.ac 72a5e42beb090b32bca580285dc0ab3c4670adb8
@@@ -1427,7 -1426,10 +1427,8 @@@ F tool/vdbe_profile.tcl 246d0da094856d7
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P 6926f28cd56bf61f7c92877baa54024bee7cbab5
- R a71ae48fc3eb916c5bf5cda4edac941f
- U dan
- Z 4a750b37db683e6936f9a933a2b590b6
 -P ca91bd8ac70a5b3fef127364f73ec675e58bb92c
 -R 1ddcbe680d5a6ea9a1dc01ec422c820c
 -T *branch * win10sdk
 -T *sym-win10sdk *
 -T -sym-trunk *
++P 85eb05ddbc3a7cff986af13c3dab6c0063e62171 ebace2c99b6af9230c4bbc31a764c7f397200148
++R 7f11f3c1dcb5601b2c82dcb73372e020
++T +closed ebace2c99b6af9230c4bbc31a764c7f397200148
+ U mistachkin
 -Z 9a5014635472c911640e985821bf4dea
++Z ac6553c79aaf86d7e04ebeafa308be17
diff --cc manifest.uuid
index 3aba9ebffc,bf7c81653a..583f181cdb
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 85eb05ddbc3a7cff986af13c3dab6c0063e62171
 -ebace2c99b6af9230c4bbc31a764c7f397200148
++1e563c6ebbb02d2e89760c7a7f95aa69964629c6