/ Check-in [68a71e5f4e]
Login

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

Overview
Comment:For MSVC, migrate some commonly used shell compilation options to the library.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 68a71e5f4e9cbd15eb64d271008e29f40913480bac467b90fb64f0269ad75818
User & Date: mistachkin 2018-09-12 00:48:17
Context
2018-09-12
01:05
Fix some harmless compiler warnings seen with MSVC. check-in: 78862252da user: mistachkin tags: trunk
00:48
For MSVC, migrate some commonly used shell compilation options to the library. check-in: 68a71e5f4e user: mistachkin tags: trunk
00:21
Fix a harmless compiler warning that arose from the ENABLE_CURSOR_HINTS fix of check-in [0af18674ca5b34e67e] check-in: f578e62ae6 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   334    334   
   335    335   # These are the "standard" SQLite compilation options used when compiling for
   336    336   # the Windows platform.
   337    337   #
   338    338   !IFNDEF OPT_FEATURE_FLAGS
   339    339   !IF $(MINIMAL_AMALGAMATION)==0
   340    340   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
   341         -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1 -DSQLITE_ENABLE_GEOPOLY=1
          341  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
          342  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1
          343  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
          344  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
          345  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
          346  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
          347  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
   342    348   !ENDIF
   343    349   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
   344    350   !ENDIF
   345    351   
   346    352   # Should the session extension be enabled?  If so, add compilation options
   347    353   # to enable it.
   348    354   #
................................................................................
  1192   1198            date.lo dbpage.lo dbstat.lo delete.lo \
  1193   1199            expr.lo fault.lo fkey.lo \
  1194   1200            fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
  1195   1201            fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
  1196   1202            fts3_tokenize_vtab.lo fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
  1197   1203            fts5.lo \
  1198   1204            func.lo global.lo hash.lo \
  1199         -         icu.lo insert.lo legacy.lo loadext.lo \
         1205  +         icu.lo insert.lo json1.lo legacy.lo loadext.lo \
  1200   1206            main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
  1201   1207            memdb.lo memjournal.lo \
  1202   1208            mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
  1203   1209            notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
  1204   1210            pager.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
  1205   1211            random.lo resolve.lo rowset.lo rtree.lo \
  1206         -         sqlite3session.lo select.lo sqlite3rbu.lo status.lo \
         1212  +         sqlite3session.lo select.lo sqlite3rbu.lo status.lo stmt.lo \
  1207   1213            table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
  1208   1214            update.lo upsert.lo util.lo vacuum.lo \
  1209   1215            vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
  1210   1216            vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
  1211   1217            window.lo utf.lo vtab.lo
  1212   1218   # <</mark>>
  1213   1219   
................................................................................
  1619   1625     $(TOP)\test\fuzzdata6.db
  1620   1626   # <</mark>>
  1621   1627   
  1622   1628   # Additional compiler options for the shell.  These are only effective
  1623   1629   # when the shell is not being dynamically linked.
  1624   1630   #
  1625   1631   !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
  1626         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
  1627         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_DBSTAT_VTAB
  1628         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_INTROSPECTION_PRAGMAS
  1629         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_RTREE
         1632  +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
         1633  +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
         1634  +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
  1630   1635   !ENDIF
  1631   1636   
  1632   1637   # <<mark>>
  1633   1638   # Extra compiler options for various test tools.
  1634   1639   #
  1635   1640   MPTESTER_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5
  1636   1641   FUZZERSHELL_COMPILE_OPTS = -DSQLITE_ENABLE_JSON1
................................................................................
  2194   2199   
  2195   2200   fts3_unicode2.lo:	$(TOP)\ext\fts3\fts3_unicode2.c $(HDR) $(EXTHDR)
  2196   2201   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_unicode2.c
  2197   2202   
  2198   2203   fts3_write.lo:	$(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
  2199   2204   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
  2200   2205   
         2206  +json1.lo:	$(TOP)\ext\misc\json1.c $(HDR) $(EXTHDR)
         2207  +	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\json1.c
         2208  +
         2209  +stmt.lo:	$(TOP)\ext\misc\stmt.c $(HDR) $(EXTHDR)
         2210  +	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\misc\stmt.c
         2211  +
  2201   2212   rtree.lo:	$(TOP)\ext\rtree\rtree.c $(HDR) $(EXTHDR)
  2202   2213   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\rtree\rtree.c
  2203   2214   
  2204   2215   sqlite3session.lo:	$(TOP)\ext\session\sqlite3session.c $(HDR) $(EXTHDR)
  2205   2216   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\session\sqlite3session.c
  2206   2217   
  2207   2218   # FTS5 things
................................................................................
  2276   2287   # hidden when the library is built via the amalgamation).
  2277   2288   #
  2278   2289   TESTFIXTURE_FLAGS = -DTCLSH_INIT_PROC=sqlite3TestInit -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
  2279   2290   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
  2280   2291   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
  2281   2292   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
  2282   2293   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
  2283         -TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB
  2284         -TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB
  2285         -TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1
         2294  +TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
         2295  +TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
         2296  +TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
  2286   2297   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) $(TEST_CCONV_OPTS)
  2287   2298   
  2288   2299   TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
  2289   2300   TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
  2290   2301   !IF $(USE_AMALGAMATION)==0
  2291   2302   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  2292   2303   !ELSE

Changes to autoconf/Makefile.msc.

   273    273   # These are the "standard" SQLite compilation options used when compiling for
   274    274   # the Windows platform.
   275    275   #
   276    276   !IFNDEF OPT_FEATURE_FLAGS
   277    277   !IF $(MINIMAL_AMALGAMATION)==0
   278    278   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
   279    279   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
          280  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_GEOPOLY=1
          281  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_JSON1=1
          282  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_STMTVTAB=1
          283  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBPAGE_VTAB=1
          284  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_DBSTAT_VTAB=1
          285  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_INTROSPECTION_PRAGMAS=1
   280    286   !ENDIF
   281    287   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
   282    288   !ENDIF
   283    289   
   284    290   # Should the session extension be enabled?  If so, add compilation options
   285    291   # to enable it.
   286    292   #
................................................................................
   924    930   !ENDIF
   925    931   
   926    932   
   927    933   # Additional compiler options for the shell.  These are only effective
   928    934   # when the shell is not being dynamically linked.
   929    935   #
   930    936   !IF $(DYNAMIC_SHELL)==0 && $(FOR_WIN10)==0
   931         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_STMTVTAB
   932         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_ENABLE_DBSTAT_VTAB
   933         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC -DSQLITE_INTROSPECTION_PRAGMAS
   934         -SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_RTREE
          937  +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_FTS4=1
          938  +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
          939  +SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
   935    940   !ENDIF
   936    941   
   937    942   
   938    943   # This is the default Makefile target.  The objects listed here
   939    944   # are what get build when you type just "make" with no arguments.
   940    945   #
   941    946   core:	dll shell