/ Check-in [c1ab9092]
Login

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

Overview
Comment:When building for Windows 8.0 using Visual Studio 2013, make sure the cross-compilation native library path is set correctly.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: c1ab9092e29bc9d172c1f1a3becbcc83b79f2080
User & Date: mistachkin 2014-05-05 22:43:17
Context
2014-05-06
21:26
Enhance the VSIX package creation tool to better support Visual Studio 2013. check-in: c1fb04f6 user: mistachkin tags: trunk
15:28
Experimental changes that reduce the size of Expr objects from 72 to 64 bytes each on x64 and from 48 to 44 bytes each on x32. Leaf check-in: 8ad0a123 user: drh tags: smaller-expr
2014-05-05
22:50
Merge updates from trunk. check-in: 668ed76a user: mistachkin tags: vsixWinPhone81
22:43
When building for Windows 8.0 using Visual Studio 2013, make sure the cross-compilation native library path is set correctly. check-in: c1ab9092 user: mistachkin tags: trunk
21:08
More modularization work on the MSVC batch build tool. check-in: 9a06773a user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   958    958   
   959    959   # Rules to build the LEMON compiler generator
   960    960   #
   961    961   lempar.c:	$(TOP)\src\lempar.c
   962    962   	copy $(TOP)\src\lempar.c .
   963    963   
   964    964   lemon.exe:	$(TOP)\tool\lemon.c lempar.c
   965         -	$(BCC) -Daccess=_access -Fe$@ $(TOP)\tool\lemon.c /link $(NLTLIBPATHS)
          965  +	$(BCC) -Daccess=_access -Fe$@ $(TOP)\tool\lemon.c /link $(NLTLINKOPTS) $(NLTLIBPATHS)
   966    966   
   967    967   # Rules to build individual *.lo files from generated *.c files. This
   968    968   # applies to:
   969    969   #
   970    970   #     parse.lo
   971    971   #     opcodes.lo
   972    972   #
................................................................................
  1226   1226   	move parse.h parse.h.temp
  1227   1227   	$(NAWK) -f $(TOP)\addopcodes.awk parse.h.temp > parse.h
  1228   1228   
  1229   1229   sqlite3.h:	$(TOP)\src\sqlite.h.in $(TOP)\manifest.uuid $(TOP)\VERSION
  1230   1230   	$(TCLSH_CMD) $(TOP)\tool\mksqlite3h.tcl $(TOP:\=/) > sqlite3.h
  1231   1231   
  1232   1232   mkkeywordhash.exe:	$(TOP)\tool\mkkeywordhash.c
  1233         -	$(BCC) -Fe$@ $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)\tool\mkkeywordhash.c /link $(NLTLIBPATHS)
         1233  +	$(BCC) -Fe$@ $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)\tool\mkkeywordhash.c /link $(NLTLINKOPTS) $(NLTLIBPATHS)
  1234   1234   
  1235   1235   keywordhash.h:	$(TOP)\tool\mkkeywordhash.c mkkeywordhash.exe
  1236   1236   	.\mkkeywordhash.exe > keywordhash.h
  1237   1237   
  1238   1238   
  1239   1239   
  1240   1240   # Rules to build the extension objects.

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

   273    273     REM
   274    274     FOR /F "tokens=2* delims==" %%D IN ('SET PLATFORMNAME') DO (
   275    275       REM
   276    276       REM NOTE: Attempt to clean the environment of all variables used by MSVC
   277    277       REM       and/or Visual Studio.  This block may need to be updated in the
   278    278       REM       future to account for additional environment variables.
   279    279       REM
          280  +    CALL :fn_UnsetVariable CommandPromptType
   280    281       CALL :fn_UnsetVariable DevEnvDir
   281    282       CALL :fn_UnsetVariable ExtensionSdkDir
   282    283       CALL :fn_UnsetVariable Framework35Version
   283    284       CALL :fn_UnsetVariable Framework40Version
   284    285       CALL :fn_UnsetVariable FrameworkDir
   285    286       CALL :fn_UnsetVariable FrameworkDir32
   286    287       CALL :fn_UnsetVariable FrameworkVersion
................................................................................
   310    311       REM
   311    312       FOR %%B IN (%CONFIGURATIONS%) DO (
   312    313         REM
   313    314         REM NOTE: When preparing the debug build, set the DEBUG and MEMDEBUG
   314    315         REM       environment variables to be picked up by the MSVC makefile
   315    316         REM       itself.
   316    317         REM
   317         -      %_AECHO% Building the "%%B" configuration for platform "%%D"...
          318  +      %_AECHO% Building the %%B configuration for platform %%P with name %%D...
   318    319   
   319    320         IF /I "%%B" == "Debug" (
   320    321           SET DEBUG=2
   321    322           SET MEMDEBUG=1
   322    323         ) ELSE (
   323    324           CALL :fn_UnsetVariable DEBUG
   324    325           CALL :fn_UnsetVariable MEMDEBUG
................................................................................
   391    392   
   392    393               REM
   393    394               REM NOTE: The Windows 8.1 SDK has a slightly different directory
   394    395               REM       naming convention.
   395    396               REM
   396    397               IF DEFINED USE_WINV63_NSDKLIBPATH (
   397    398                 CALL :fn_AppendVariable NSDKLIBPATH \lib\winv6.3\um\x86
          399  +            ) ELSE IF "%VisualStudioVersion%" == "12.0" (
          400  +              CALL :fn_AppendVariable NSDKLIBPATH \..\8.0\lib\win8\um\x86
   398    401               ) ELSE (
   399    402                 CALL :fn_AppendVariable NSDKLIBPATH \lib\win8\um\x86
   400    403               )
   401    404             )
   402    405           )
   403    406   
   404    407           REM