/ Check-in [25b46a9c]
Login

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

Overview
Comment:In the MSVC Makefile, make the DYNAMIC_SHELL option work without USE_STDCALL.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 25b46a9c7e03a84bee2ffddc6d7fd6ae280e9d7b
User & Date: mistachkin 2015-03-27 00:19:31
Context
2015-03-27
00:21
Using MSVC, get the sqlite3IoTrace variable working with the USE_STDCALL and/or DYNAMIC_SHELL options. check-in: fe976c91 user: mistachkin tags: trunk
00:19
In the MSVC Makefile, make the DYNAMIC_SHELL option work without USE_STDCALL. check-in: 25b46a9c user: mistachkin tags: trunk
2015-03-26
18:24
Revise Win32 locking test to account for recent log message changes. check-in: 1bc76339 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   327    327   CORE_CCONV_OPTS =
   328    328   SHELL_CCONV_OPTS =
   329    329   !ENDIF
   330    330   
   331    331   # These are additional compiler options used for the core library.
   332    332   #
   333    333   !IFNDEF CORE_COMPILE_OPTS
   334         -!IF $(USE_STDCALL)!=0
          334  +!IF $(DYNAMIC_SHELL)!=0
   335    335   CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS) -DSQLITE_API=__declspec(dllexport)
   336    336   !ELSE
   337    337   CORE_COMPILE_OPTS = $(CORE_CCONV_OPTS)
   338    338   !ENDIF
   339    339   !ENDIF
   340    340   
   341    341   # These are the additional targets that the core library should depend on
   342    342   # when linking.
   343    343   #
   344    344   !IFNDEF CORE_LINK_DEP
   345         -!IF $(USE_STDCALL)!=0
          345  +!IF $(DYNAMIC_SHELL)!=0
   346    346   CORE_LINK_DEP =
   347    347   !ELSE
   348    348   CORE_LINK_DEP = sqlite3.def
   349    349   !ENDIF
   350    350   !ENDIF
   351    351   
   352    352   # These are additional linker options used for the core library.
   353    353   #
   354    354   !IFNDEF CORE_LINK_OPTS
   355         -!IF $(USE_STDCALL)!=0
          355  +!IF $(DYNAMIC_SHELL)!=0
   356    356   CORE_LINK_OPTS =
   357    357   !ELSE
   358    358   CORE_LINK_OPTS = /DEF:sqlite3.def
   359    359   !ENDIF
   360    360   !ENDIF
   361    361   
   362    362   # These are additional compiler options used for the shell executable.