/ Check-in [96559adb]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Support building VSIX packages for UAP using Visual Studio 2015 and the Windows 10 SDK.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 96559adbf18bbbf25ff4e1579ee3ff2afef4c4d7
User & Date: mistachkin 2015-07-29 22:38:45
Context
2015-07-30
11:26
Return an error message (instead of segfaulting) if test function fts5_expr() is invoked with no arguments. check-in: 8e818b89 user: dan tags: trunk
2015-07-29
22:38
Support building VSIX packages for UAP using Visual Studio 2015 and the Windows 10 SDK. check-in: 96559adb user: mistachkin tags: trunk
22:37
Update Windows 10 SDK version for RTM. Closed-Leaf check-in: 80ab338c user: mistachkin tags: msvc2015
21:47
Add SQLITE_DISABLE_INTRINSIC define to disable use of intrinsic functions (e.g. for certain older compilers and/or platforms). check-in: f0075d73 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to tool/build-all-msvc.bat.

   308    308     REM       it to something else later on.
   309    309     REM
   310    310     IF NOT DEFINED NUCRTLIBPATH (
   311    311       SET SET_NUCRTLIBPATH=1
   312    312     )
   313    313   )
   314    314   
          315  +REM
          316  +REM NOTE: This is the name of the sub-directory where the Windows 10.0 SDK
          317  +REM       libraries may be found.  It is only used when compiling with the
          318  +REM       Windows 10.0 SDK.
          319  +REM
          320  +SET WIN10LIBDIR=10.0.10240.0
          321  +
   315    322   REM
   316    323   REM NOTE: Check if this is the Windows Phone SDK.  If so, a different batch
   317    324   REM       file is necessary to setup the build environment.  Since the variable
   318    325   REM       values involved here may contain parenthesis, using GOTO instead of
   319    326   REM       an IF block is required.
   320    327   REM
   321    328   IF DEFINED WindowsPhoneKitDir GOTO set_vcvarsall_phone
................................................................................
   478    485               CALL :fn_CopyVariable WindowsSdkDir NSDKLIBPATH
   479    486   
   480    487               REM
   481    488               REM NOTE: The Windows 8.x and Windows 10.0 SDKs have a slightly
   482    489               REM       different directory naming conventions.
   483    490               REM
   484    491               IF DEFINED USE_WINV100_NSDKLIBPATH (
   485         -              CALL :fn_AppendVariable NSDKLIBPATH \..\10\lib\10.0.10030.0\um\x86
          492  +              CALL :fn_AppendVariable NSDKLIBPATH \..\10\lib\%WIN10LIBDIR%\um\x86
   486    493                 CALL :fn_CopyVariable UniversalCRTSdkDir PSDKLIBPATH
   487         -              CALL :fn_AppendVariable PSDKLIBPATH Lib\10.0.10030.0\um\%%D
          494  +              CALL :fn_AppendVariable PSDKLIBPATH Lib\%WIN10LIBDIR%\um\%%D
   488    495               ) ELSE IF DEFINED USE_WINV63_NSDKLIBPATH (
   489    496                 CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
   490    497               ) ELSE IF "%VisualStudioVersion%" == "12.0" (
   491    498                 CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
   492    499               ) ELSE IF "%VisualStudioVersion%" == "14.0" (
   493    500                 CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
   494    501               ) ELSE (
................................................................................
   503    510           REM       each iteration because it relies upon the UniversalCRTSdkDir
   504    511           REM       environment variable being set by the batch file used to
   505    512           REM       setup the MSVC environment.
   506    513           REM
   507    514           IF DEFINED SET_NUCRTLIBPATH (
   508    515             IF DEFINED UniversalCRTSdkDir (
   509    516               CALL :fn_CopyVariable UniversalCRTSdkDir NUCRTLIBPATH
   510         -            CALL :fn_AppendVariable NUCRTLIBPATH \lib\winv10.0\ucrt\x86
          517  +            CALL :fn_AppendVariable NUCRTLIBPATH \lib\%WIN10LIBDIR%\ucrt\x86
   511    518             )
   512    519           )
   513    520   
   514    521           REM
   515    522           REM NOTE: Unless prevented from doing so, invoke NMAKE with the MSVC
   516    523           REM       makefile to clean any stale build output from previous
   517    524           REM       iterations of this loop and/or previous runs of this batch