Support building with SQLITE_ENABLE_SESSION under MSVC.

FossilOrigin-Name: 2845654d425164de143e82b9fdb255d81a01af56
This commit is contained in:
mistachkin 2012-01-16 12:33:36 +00:00
parent af49af7f9e
commit adb96a62e5
3 changed files with 27 additions and 11 deletions

View File

@ -178,6 +178,8 @@ TCC = $(TCC) -DSQLITE_TEMP_STORE=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_FTS3=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_RTREE=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_COLUMN_METADATA=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_SESSION=1
OPT_FEATURE_FLAGS = $(OPT_FEATURE_FLAGS) -DSQLITE_ENABLE_PREUPDATE_HOOK=1
# END standard options
# BEGIN required Windows option
@ -412,6 +414,9 @@ SRC = $(SRC) \
SRC = $(SRC) \
$(TOP)\ext\rtree\rtree.h \
$(TOP)\ext\rtree\rtree.c
SRC = $(SRC) \
$(TOP)\ext\session\sqlite3session.h \
$(TOP)\ext\session\sqlite3session.c
# Generated source code files
@ -468,9 +473,11 @@ TESTSRC = \
$(TOP)\src\test_wholenumber.c \
$(TOP)\src\test_wsd.c \
$(TOP)\ext\fts3\fts3_term.c \
$(TOP)\ext\fts3\fts3_test.c
$(TOP)\ext\fts3\fts3_test.c \
$(TOP)\ext\session\test_session.c
# Source code to the library files needed by the test fixture
# (non-amalgamation)
#
TESTSRC2 = \
$(TOP)\src\attach.c \
@ -513,7 +520,14 @@ TESTSRC2 = \
$(TOP)\ext\fts3\fts3_expr.c \
$(TOP)\ext\fts3\fts3_tokenizer.c \
$(TOP)\ext\fts3\fts3_write.c \
$(TOP)\ext\async\sqlite3async.c
$(TOP)\ext\async\sqlite3async.c \
$(TOP)\ext\session\sqlite3session.c
# Source code to the library files needed by the test fixture
# (amalgamation)
#
TESTSRC3 = \
$(TOP)\ext\session\sqlite3session.c
# Header files used by all library source files.
#
@ -558,6 +572,8 @@ EXTHDR = $(EXTHDR) \
$(TOP)\ext\icu\sqliteicu.h
EXTHDR = $(EXTHDR) \
$(TOP)\ext\rtree\sqlite3rtree.h
EXTHDR = $(EXTHDR) \
$(TOP)\ext\session\sqlite3session.h
# This is the default Makefile target. The objects listed here
# are what get build when you type just "make" with no arguments.
@ -944,7 +960,7 @@ TESTFIXTURE_FLAGS = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
TESTFIXTURE_FLAGS = $(TESTFIXTURE_FLAGS) -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.lib
TESTFIXTURE_SRC1 = sqlite3.c
TESTFIXTURE_SRC1 = $(TESTSRC3) sqlite3.c
!IF $(USE_AMALGAMATION)==0
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
!ELSE

View File

@ -1,9 +1,9 @@
C Update\ssessions\sbranch\swith\slatest\schanges\sfrom\strunk.
D 2012-01-14T13:50:12.463
C Support\sbuilding\swith\sSQLITE_ENABLE_SESSION\sunder\sMSVC.
D 2012-01-16T12:33:36.900
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F Makefile.msc dcad80fa69f17d46fe6778ba873fc108ca16298d
F Makefile.msc 340b6d1bb4553c389d6837aa437d7c25dc03f980
F Makefile.vxworks 1deb39c8bb047296c30161ffa10c1b5423e632f9
F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
F VERSION af03cd6400f9d71d38bdb7a9d66a1aefdc2f3e0d
@ -1000,7 +1000,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
P a9bcb432f58b96f079a73c456efd4851c582221e 88ad2f23c5036cbb4a69b73ce5792bd5c33a9177
R 30723a7c24a6752d8bfb2c322e9b8748
U dan
Z 241182607d7d4efdfae3b5115d25b877
P 01c84fd391a0ca1f5245c7eff0644d0cc6cff86b
R 88d7ca9f3f2aa524ac3a66d4c2e7567b
U mistachkin
Z 171e4d9c94c739b476f164aff1375bac

View File

@ -1 +1 @@
01c84fd391a0ca1f5245c7eff0644d0cc6cff86b
2845654d425164de143e82b9fdb255d81a01af56