Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix MSVC makefile options that enable control-flow guard. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
51b6823f4c9376d549f572f5a33cac1e |
| User & Date: | mistachkin 2016-02-09 18:28:20 |
Context
|
2016-02-09
| ||
| 20:11 | Enhance the command-line shell to be in auto-explain mode by default. It is no longer necessary to use the ".explain" command to put the shell into a mode where the EXPLAIN output is formatted nicely. That now happens automatically. (check-in: 751915cb user: drh tags: trunk) | |
| 18:39 | Add auto-explain mode to the command-line shell. Default on. Auto-explain tries to automatically detect EXPLAIN queries and format them appropriately. (check-in: 1d62aa6b user: drh tags: auto-explain) | |
| 18:28 | Fix MSVC makefile options that enable control-flow guard. (check-in: 51b6823f user: mistachkin tags: trunk) | |
| 17:12 | Fix the top-level makefiles to always include SQLITE_ENABLE_EXPLAIN_COMMENTS when building the shell. Still need to fix main.mk and the amalgamation tarball. (check-in: 99228239 user: drh tags: trunk) | |
Changes
Changes to Makefile.msc.
547 547 TCC = $(TCC) -DWINAPI_FAMILY=WINAPI_FAMILY_APP 548 548 RCC = $(RCC) -DWINAPI_FAMILY=WINAPI_FAMILY_APP 549 549 !ENDIF 550 550 551 551 # C compiler options for the Windows 10 platform (needs MSVC 2015). 552 552 # 553 553 !IF $(FOR_WIN10)!=0 554 -TCC = $(TCC) /guard:cf -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 555 -BCC = $(BCC) /guard:cf -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 554 +TCC = $(TCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 555 +BCC = $(BCC) /d2guard4 -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE 556 556 !ENDIF 557 557 558 558 # Also, we need to dynamically link to the correct MSVC runtime 559 559 # when compiling for WinRT (e.g. debug or release) OR if the 560 560 # USE_CRT_DLL option is set to force dynamically linking to the 561 561 # MSVC runtime library. 562 562 # ................................................................................ 915 915 LTLINKOPTS = $(LTLINKOPTS) mincore.lib 916 916 !IFDEF PSDKLIBPATH 917 917 LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(PSDKLIBPATH)" 918 918 !ENDIF 919 919 !ENDIF 920 920 921 921 !IF $(FOR_WIN10)!=0 922 -LTLINKOPTS = $(LTLINKOPTS) "/LIBPATH:$(UCRTLIBPATH)" 922 +LTLINKOPTS = $(LTLINKOPTS) /guard:cf "/LIBPATH:$(UCRTLIBPATH)" 923 923 !IF $(DEBUG)>1 924 924 LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:libucrtd.lib /DEFAULTLIB:ucrtd.lib 925 925 !ELSE 926 926 LTLINKOPTS = $(LTLINKOPTS) /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib 927 927 !ENDIF 928 928 !ENDIF 929 929