/ Check-in [7cf0cab7]
Login

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

Overview
Comment:Updates for the MSVC makefiles.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 7cf0cab730e2d570c82dd789279ad6501ac598c8
User & Date: mistachkin 2016-03-30 16:23:06
Context
2016-03-31
20:40
Enhance the query planner so that IS and IS NULL operators are able to drive an index on a LEFT OUTER JOIN. check-in: c648539b user: drh tags: trunk
2016-03-30
21:19
Have the sqlite3session_apply() function and its streaming equivalent retry any operations that failed with SQLITE_CONSTRAINT after all other operations on the same table have been attempted. New code is largely untested. check-in: 1085911a user: dan tags: session-retry
16:23
Updates for the MSVC makefiles. check-in: 7cf0cab7 user: mistachkin tags: trunk
16:22
Fix typo in comment. No changes to code. check-in: 64d75cbe user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   260    260   # These are the "standard" SQLite compilation options used when compiling for
   261    261   # the Windows platform.
   262    262   #
   263    263   !IFNDEF OPT_FEATURE_FLAGS
   264    264   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
   265    265   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
   266    266   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
          267  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
          268  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
   267    269   !ENDIF
   268    270   
   269    271   # These are the "extended" SQLite compilation options used when compiling for
   270    272   # the Windows 10 platform.
   271    273   #
   272    274   !IFNDEF EXT_FEATURE_FLAGS
   273    275   !IF $(FOR_WIN10)!=0
................................................................................
   780    782   RCC = $(RCC) -DSQLITE_TEMP_STORE=1
   781    783   
   782    784   # Enable/disable loadable extensions, and other optional features
   783    785   # based on configuration. (-DSQLITE_OMIT*, -DSQLITE_ENABLE*).
   784    786   # The same set of OMIT and ENABLE flags should be passed to the
   785    787   # LEMON parser generator and the mkkeywordhash tool as well.
   786    788   
   787         -# BEGIN standard options
   788         -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
   789         -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
   790         -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
   791         -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
   792         -OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
   793         -# END standard options
   794         -
   795    789   # These are the required SQLite compilation options used when compiling for
   796    790   # the Windows platform.
   797    791   #
   798    792   REQ_FEATURE_FLAGS = $(REQ_FEATURE_FLAGS) -DSQLITE_MAX_TRIGGER_DEPTH=100
   799    793   
   800    794   # If we are linking to the RPCRT4 library, enable features that need it.
   801    795   #
................................................................................
  1185   1179     $(TOP)\ext\fts3\fts3_tokenizer1.c \
  1186   1180     $(TOP)\ext\fts3\fts3_tokenize_vtab.c \
  1187   1181     $(TOP)\ext\fts3\fts3_unicode.c \
  1188   1182     $(TOP)\ext\fts3\fts3_unicode2.c \
  1189   1183     $(TOP)\ext\fts3\fts3_write.c \
  1190   1184     $(TOP)\ext\icu\icu.c \
  1191   1185     $(TOP)\ext\rtree\rtree.c \
  1192         -  $(TOP)\ext\session\sqlite3session.h \
  1193   1186     $(TOP)\ext\session\sqlite3session.c \
  1194         -  $(TOP)\ext\rbu\sqlite3rbu.h \
  1195   1187     $(TOP)\ext\rbu\sqlite3rbu.c \
  1196   1188     $(TOP)\ext\misc\json1.c
  1197   1189   
  1198   1190   # Extension header files, part 1.
  1199   1191   #
  1200   1192   SRC08 = \
  1201   1193     $(TOP)\ext\fts1\fts1.h \
................................................................................
  1210   1202   SRC09 = \
  1211   1203     $(TOP)\ext\fts3\fts3.h \
  1212   1204     $(TOP)\ext\fts3\fts3Int.h \
  1213   1205     $(TOP)\ext\fts3\fts3_hash.h \
  1214   1206     $(TOP)\ext\fts3\fts3_tokenizer.h \
  1215   1207     $(TOP)\ext\icu\sqliteicu.h \
  1216   1208     $(TOP)\ext\rtree\rtree.h \
  1217         -  $(TOP)\ext\rbu\sqlite3rbu.h
         1209  +  $(TOP)\ext\rbu\sqlite3rbu.h \
         1210  +  $(TOP)\ext\session\sqlite3session.h
  1218   1211   
  1219   1212   # Generated source code files
  1220   1213   #
  1221   1214   SRC10 = \
  1222   1215     opcodes.c \
  1223   1216     parse.c
  1224   1217   
................................................................................
  1276   1269     $(TOP)\src\test_tclvar.c \
  1277   1270     $(TOP)\src\test_thread.c \
  1278   1271     $(TOP)\src\test_vfs.c \
  1279   1272     $(TOP)\src\test_windirent.c \
  1280   1273     $(TOP)\src\test_wsd.c \
  1281   1274     $(TOP)\ext\fts3\fts3_term.c \
  1282   1275     $(TOP)\ext\fts3\fts3_test.c \
  1283         -  $(TOP)\ext\session\test_session.c \
  1284         -  $(TOP)\ext\rbu\test_rbu.c
         1276  +  $(TOP)\ext\rbu\test_rbu.c \
         1277  +  $(TOP)\ext\session\test_session.c
  1285   1278   
  1286   1279   # Statically linked extensions.
  1287   1280   #
  1288   1281   TESTEXT = \
  1289   1282     $(TOP)\ext\misc\amatch.c \
  1290   1283     $(TOP)\ext\misc\closure.c \
  1291   1284     $(TOP)\ext\misc\eval.c \
................................................................................
  1308   1301   #
  1309   1302   TESTSRC2 = \
  1310   1303     $(SRC00) \
  1311   1304     $(SRC01) \
  1312   1305     $(SRC06) \
  1313   1306     $(SRC07) \
  1314   1307     $(SRC10) \
  1315         -  $(TOP)\ext\async\sqlite3async.c \
  1316         -  $(TOP)\ext\session\sqlite3session.c
  1317         -
  1318         -# Source code to the library files needed by the test fixture
  1319         -# (amalgamation)
  1320         -#
  1321         -TESTSRC3 =
  1322         -
         1308  +  $(TOP)\ext\async\sqlite3async.c
  1323   1309   
  1324   1310   # Header files used by all library source files.
  1325   1311   #
  1326   1312   HDR = \
  1327   1313      $(TOP)\src\btree.h \
  1328   1314      $(TOP)\src\btreeInt.h \
  1329   1315      $(TOP)\src\hash.h \
................................................................................
  1893   1879   fts3_write.lo:	$(TOP)\ext\fts3\fts3_write.c $(HDR) $(EXTHDR)
  1894   1880   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\fts3\fts3_write.c
  1895   1881   
  1896   1882   rtree.lo:	$(TOP)\ext\rtree\rtree.c $(HDR) $(EXTHDR)
  1897   1883   	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\rtree\rtree.c
  1898   1884   
  1899   1885   sqlite3session.lo:	$(TOP)\ext\session\sqlite3sesion.c $(HDR) $(EXTHDR)
  1900         -	$(LTCOMPILE) -DSQLITE_CORE -c $(TOP)\ext\session\sqlite3session.c
         1886  +	$(LTCOMPILE) $(CORE_COMPILE_OPTS) $(NO_WARN) -DSQLITE_CORE -c $(TOP)\ext\session\sqlite3session.c
  1901   1887   
  1902   1888   # FTS5 things
  1903   1889   #
  1904   1890   FTS5_SRC = \
  1905   1891      $(TOP)\ext\fts5\fts5.h \
  1906   1892      $(TOP)\ext\fts5\fts5Int.h \
  1907   1893      $(TOP)\ext\fts5\fts5_aux.c \
................................................................................
  1951   1937   TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
  1952   1938   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE=""
  1953   1939   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_CORE $(NO_WARN)
  1954   1940   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
  1955   1941   TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_DEFAULT_PAGE_SIZE=1024
  1956   1942   
  1957   1943   TESTFIXTURE_SRC0 = $(TESTEXT) $(TESTSRC2)
  1958         -TESTFIXTURE_SRC1 = $(TESTEXT) $(TESTSRC3) $(SQLITE3C)
         1944  +TESTFIXTURE_SRC1 = $(TESTEXT) $(SQLITE3C)
  1959   1945   !IF $(USE_AMALGAMATION)==0
  1960   1946   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
  1961   1947   !ELSE
  1962   1948   TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC1)
  1963   1949   !ENDIF
  1964   1950   
  1965   1951   testfixture.exe:	$(TESTFIXTURE_SRC) $(SQLITE3H) $(LIBRESOBJS) $(HDR)
................................................................................
  2043   2029   		$(TOP)\tool\showjournal.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
  2044   2030   
  2045   2031   showwal.exe:	$(TOP)\tool\showwal.c $(SQLITE3C) $(SQLITE3H)
  2046   2032   	$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
  2047   2033   		$(TOP)\tool\showwal.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
  2048   2034   
  2049   2035   changeset.exe:	$(TOP)\ext\session\changeset.c $(SQLITE3C)
  2050         -	$(LTLINK) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
  2051         -		$(TOP)\ext\session\changeset.c $(SQLITE3C)
         2036  +	$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
         2037  +		$(TOP)\ext\session\changeset.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
  2052   2038   
  2053   2039   fts3view.exe:	$(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C) $(SQLITE3H)
  2054   2040   	$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \
  2055   2041   		$(TOP)\ext\fts3\tool\fts3view.c $(SQLITE3C) /link $(LDFLAGS) $(LTLINKOPTS)
  2056   2042   
  2057   2043   rollback-test.exe:	$(TOP)\tool\rollback-test.c $(SQLITE3C) $(SQLITE3H)
  2058   2044   	$(LTLINK) $(NO_WARN) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -Fe$@ \

Changes to autoconf/Makefile.msc.

   245    245   # These are the "standard" SQLite compilation options used when compiling for
   246    246   # the Windows platform.
   247    247   #
   248    248   !IFNDEF OPT_FEATURE_FLAGS
   249    249   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
   250    250   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
   251    251   OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
          252  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
          253  +OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
   252    254   !ENDIF
   253    255   
   254    256   # These are the "extended" SQLite compilation options used when compiling for
   255    257   # the Windows 10 platform.
   256    258   #
   257    259   !IFNDEF EXT_FEATURE_FLAGS
   258    260   !IF $(FOR_WIN10)!=0