Fossil SCM
For Solaris, omit the XOPEN_SOURCE define, as this is no longer recommended, according to private email from Claes Nästén. Also disable some obsolete compile-time options to SQLite.
Commit
5b0c71d1fceb2d9f6da5c7a9a8b04647cdb995ad3c76798c58f0b5c91a046bfe
Parent
0ca1fc4d98b8e41…
7 files changed
+1
-1
-6
-3
+2
-2
+2
-2
-6
-6
M
auto.def
+1
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -232,11 +232,11 @@ | ||
| 232 | 232 | # |
| 233 | 233 | define USE_LINENOISE 1 |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | 236 | if {[string match *-solaris* [get-define host]]} { |
| 237 | - define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__} | |
| 237 | + define-append EXTRA_CFLAGS {-D__EXTENSIONS__} | |
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | if {[opt-bool fossil-debug]} { |
| 241 | 241 | define CFLAGS {-g -O0 -Wall} |
| 242 | 242 | define-append CFLAGS -DFOSSIL_DEBUG |
| 243 | 243 |
| --- auto.def | |
| +++ auto.def | |
| @@ -232,11 +232,11 @@ | |
| 232 | # |
| 233 | define USE_LINENOISE 1 |
| 234 | } |
| 235 | |
| 236 | if {[string match *-solaris* [get-define host]]} { |
| 237 | define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__} |
| 238 | } |
| 239 | |
| 240 | if {[opt-bool fossil-debug]} { |
| 241 | define CFLAGS {-g -O0 -Wall} |
| 242 | define-append CFLAGS -DFOSSIL_DEBUG |
| 243 |
| --- auto.def | |
| +++ auto.def | |
| @@ -232,11 +232,11 @@ | |
| 232 | # |
| 233 | define USE_LINENOISE 1 |
| 234 | } |
| 235 | |
| 236 | if {[string match *-solaris* [get-define host]]} { |
| 237 | define-append EXTRA_CFLAGS {-D__EXTENSIONS__} |
| 238 | } |
| 239 | |
| 240 | if {[opt-bool fossil-debug]} { |
| 241 | define CFLAGS {-g -O0 -Wall} |
| 242 | define-append CFLAGS -DFOSSIL_DEBUG |
| 243 |
-6
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -635,21 +635,18 @@ | ||
| 635 | 635 | -DSQLITE_OMIT_DEPRECATED \ |
| 636 | 636 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 637 | 637 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 638 | 638 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 639 | 639 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 640 | - -DSQLITE_USE_ALLOCA \ | |
| 641 | 640 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 642 | 641 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 643 | 642 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 644 | 643 | -DSQLITE_ENABLE_FTS4 \ |
| 645 | 644 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 646 | - -DSQLITE_ENABLE_JSON1 \ | |
| 647 | 645 | -DSQLITE_ENABLE_FTS5 \ |
| 648 | 646 | -DSQLITE_ENABLE_STMTVTAB \ |
| 649 | 647 | -DSQLITE_HAVE_ZLIB \ |
| 650 | - -DSQLITE_INTROSPECTION_PRAGMAS \ | |
| 651 | 648 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 652 | 649 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 653 | 650 | |
| 654 | 651 | # Setup the options used to compile the included SQLite shell. |
| 655 | 652 | SHELL_OPTIONS = -DNDEBUG=1 \ |
| @@ -662,21 +659,18 @@ | ||
| 662 | 659 | -DSQLITE_OMIT_DEPRECATED \ |
| 663 | 660 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 664 | 661 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 665 | 662 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 666 | 663 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 667 | - -DSQLITE_USE_ALLOCA \ | |
| 668 | 664 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 669 | 665 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 670 | 666 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 671 | 667 | -DSQLITE_ENABLE_FTS4 \ |
| 672 | 668 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 673 | - -DSQLITE_ENABLE_JSON1 \ | |
| 674 | 669 | -DSQLITE_ENABLE_FTS5 \ |
| 675 | 670 | -DSQLITE_ENABLE_STMTVTAB \ |
| 676 | 671 | -DSQLITE_HAVE_ZLIB \ |
| 677 | - -DSQLITE_INTROSPECTION_PRAGMAS \ | |
| 678 | 672 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 679 | 673 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 680 | 674 | -Dmain=sqlite3_shell \ |
| 681 | 675 | -DSQLITE_SHELL_IS_UTF8=1 \ |
| 682 | 676 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 683 | 677 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -635,21 +635,18 @@ | |
| 635 | -DSQLITE_OMIT_DEPRECATED \ |
| 636 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 637 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 638 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 639 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 640 | -DSQLITE_USE_ALLOCA \ |
| 641 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 642 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 643 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 644 | -DSQLITE_ENABLE_FTS4 \ |
| 645 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 646 | -DSQLITE_ENABLE_JSON1 \ |
| 647 | -DSQLITE_ENABLE_FTS5 \ |
| 648 | -DSQLITE_ENABLE_STMTVTAB \ |
| 649 | -DSQLITE_HAVE_ZLIB \ |
| 650 | -DSQLITE_INTROSPECTION_PRAGMAS \ |
| 651 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 652 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 653 | |
| 654 | # Setup the options used to compile the included SQLite shell. |
| 655 | SHELL_OPTIONS = -DNDEBUG=1 \ |
| @@ -662,21 +659,18 @@ | |
| 662 | -DSQLITE_OMIT_DEPRECATED \ |
| 663 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 664 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 665 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 666 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 667 | -DSQLITE_USE_ALLOCA \ |
| 668 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 669 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 670 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 671 | -DSQLITE_ENABLE_FTS4 \ |
| 672 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 673 | -DSQLITE_ENABLE_JSON1 \ |
| 674 | -DSQLITE_ENABLE_FTS5 \ |
| 675 | -DSQLITE_ENABLE_STMTVTAB \ |
| 676 | -DSQLITE_HAVE_ZLIB \ |
| 677 | -DSQLITE_INTROSPECTION_PRAGMAS \ |
| 678 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 679 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 680 | -Dmain=sqlite3_shell \ |
| 681 | -DSQLITE_SHELL_IS_UTF8=1 \ |
| 682 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 683 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -635,21 +635,18 @@ | |
| 635 | -DSQLITE_OMIT_DEPRECATED \ |
| 636 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 637 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 638 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 639 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 640 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 641 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 642 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 643 | -DSQLITE_ENABLE_FTS4 \ |
| 644 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 645 | -DSQLITE_ENABLE_FTS5 \ |
| 646 | -DSQLITE_ENABLE_STMTVTAB \ |
| 647 | -DSQLITE_HAVE_ZLIB \ |
| 648 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 649 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 650 | |
| 651 | # Setup the options used to compile the included SQLite shell. |
| 652 | SHELL_OPTIONS = -DNDEBUG=1 \ |
| @@ -662,21 +659,18 @@ | |
| 659 | -DSQLITE_OMIT_DEPRECATED \ |
| 660 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 661 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 662 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 663 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 664 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 665 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 666 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 667 | -DSQLITE_ENABLE_FTS4 \ |
| 668 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 669 | -DSQLITE_ENABLE_FTS5 \ |
| 670 | -DSQLITE_ENABLE_STMTVTAB \ |
| 671 | -DSQLITE_HAVE_ZLIB \ |
| 672 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 673 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 674 | -Dmain=sqlite3_shell \ |
| 675 | -DSQLITE_SHELL_IS_UTF8=1 \ |
| 676 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 677 |
-3
| --- tools/makemake.tcl | ||
| +++ tools/makemake.tcl | ||
| @@ -234,21 +234,18 @@ | ||
| 234 | 234 | -DSQLITE_OMIT_DEPRECATED |
| 235 | 235 | -DSQLITE_OMIT_PROGRESS_CALLBACK |
| 236 | 236 | -DSQLITE_OMIT_SHARED_CACHE |
| 237 | 237 | -DSQLITE_OMIT_LOAD_EXTENSION |
| 238 | 238 | -DSQLITE_MAX_EXPR_DEPTH=0 |
| 239 | - -DSQLITE_USE_ALLOCA | |
| 240 | 239 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 241 | 240 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 242 | 241 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 243 | 242 | -DSQLITE_ENABLE_FTS4 |
| 244 | 243 | -DSQLITE_ENABLE_DBSTAT_VTAB |
| 245 | - -DSQLITE_ENABLE_JSON1 | |
| 246 | 244 | -DSQLITE_ENABLE_FTS5 |
| 247 | 245 | -DSQLITE_ENABLE_STMTVTAB |
| 248 | 246 | -DSQLITE_HAVE_ZLIB |
| 249 | - -DSQLITE_INTROSPECTION_PRAGMAS | |
| 250 | 247 | -DSQLITE_ENABLE_DBPAGE_VTAB |
| 251 | 248 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 252 | 249 | } |
| 253 | 250 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 254 | 251 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 255 | 252 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -234,21 +234,18 @@ | |
| 234 | -DSQLITE_OMIT_DEPRECATED |
| 235 | -DSQLITE_OMIT_PROGRESS_CALLBACK |
| 236 | -DSQLITE_OMIT_SHARED_CACHE |
| 237 | -DSQLITE_OMIT_LOAD_EXTENSION |
| 238 | -DSQLITE_MAX_EXPR_DEPTH=0 |
| 239 | -DSQLITE_USE_ALLOCA |
| 240 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 241 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 242 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 243 | -DSQLITE_ENABLE_FTS4 |
| 244 | -DSQLITE_ENABLE_DBSTAT_VTAB |
| 245 | -DSQLITE_ENABLE_JSON1 |
| 246 | -DSQLITE_ENABLE_FTS5 |
| 247 | -DSQLITE_ENABLE_STMTVTAB |
| 248 | -DSQLITE_HAVE_ZLIB |
| 249 | -DSQLITE_INTROSPECTION_PRAGMAS |
| 250 | -DSQLITE_ENABLE_DBPAGE_VTAB |
| 251 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 252 | } |
| 253 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 254 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 255 |
| --- tools/makemake.tcl | |
| +++ tools/makemake.tcl | |
| @@ -234,21 +234,18 @@ | |
| 234 | -DSQLITE_OMIT_DEPRECATED |
| 235 | -DSQLITE_OMIT_PROGRESS_CALLBACK |
| 236 | -DSQLITE_OMIT_SHARED_CACHE |
| 237 | -DSQLITE_OMIT_LOAD_EXTENSION |
| 238 | -DSQLITE_MAX_EXPR_DEPTH=0 |
| 239 | -DSQLITE_ENABLE_LOCKING_STYLE=0 |
| 240 | -DSQLITE_DEFAULT_FILE_FORMAT=4 |
| 241 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS |
| 242 | -DSQLITE_ENABLE_FTS4 |
| 243 | -DSQLITE_ENABLE_DBSTAT_VTAB |
| 244 | -DSQLITE_ENABLE_FTS5 |
| 245 | -DSQLITE_ENABLE_STMTVTAB |
| 246 | -DSQLITE_HAVE_ZLIB |
| 247 | -DSQLITE_ENABLE_DBPAGE_VTAB |
| 248 | -DSQLITE_TRUSTED_SCHEMA=0 |
| 249 | } |
| 250 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_FTS3=1 |
| 251 | #lappend SQLITE_OPTIONS -DSQLITE_ENABLE_STAT4 |
| 252 |
+2
-2
| --- win/Makefile.PellesCGMake | ||
| +++ win/Makefile.PellesCGMake | ||
| @@ -85,17 +85,17 @@ | ||
| 85 | 85 | |
| 86 | 86 | # define the SQLite files, which need special flags on compile |
| 87 | 87 | SQLITESRC=sqlite3.c |
| 88 | 88 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf)) |
| 89 | 89 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 90 | -SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI | |
| 90 | +SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI | |
| 91 | 91 | |
| 92 | 92 | # define the SQLite shell files, which need special flags on compile |
| 93 | 93 | SQLITESHELLSRC=shell.c |
| 94 | 94 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf)) |
| 95 | 95 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 96 | -SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | |
| 96 | +SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | |
| 97 | 97 | |
| 98 | 98 | # define the th scripting files, which need special flags on compile |
| 99 | 99 | THSRC=th.c th_lang.c |
| 100 | 100 | ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) |
| 101 | 101 | THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) |
| 102 | 102 |
| --- win/Makefile.PellesCGMake | |
| +++ win/Makefile.PellesCGMake | |
| @@ -85,17 +85,17 @@ | |
| 85 | |
| 86 | # define the SQLite files, which need special flags on compile |
| 87 | SQLITESRC=sqlite3.c |
| 88 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf)) |
| 89 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 90 | SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI |
| 91 | |
| 92 | # define the SQLite shell files, which need special flags on compile |
| 93 | SQLITESHELLSRC=shell.c |
| 94 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf)) |
| 95 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 96 | SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 97 | |
| 98 | # define the th scripting files, which need special flags on compile |
| 99 | THSRC=th.c th_lang.c |
| 100 | ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) |
| 101 | THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) |
| 102 |
| --- win/Makefile.PellesCGMake | |
| +++ win/Makefile.PellesCGMake | |
| @@ -85,17 +85,17 @@ | |
| 85 | |
| 86 | # define the SQLite files, which need special flags on compile |
| 87 | SQLITESRC=sqlite3.c |
| 88 | ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR_extsrc)$(sf)) |
| 89 | SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj)) |
| 90 | SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -DSQLITE_WIN32_NO_ANSI |
| 91 | |
| 92 | # define the SQLite shell files, which need special flags on compile |
| 93 | SQLITESHELLSRC=shell.c |
| 94 | ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR_extsrc)$(sf)) |
| 95 | SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj)) |
| 96 | SQLITESHELLDEFINES=-DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 97 | |
| 98 | # define the th scripting files, which need special flags on compile |
| 99 | THSRC=th.c th_lang.c |
| 100 | ORIGTHSRC=$(foreach sf,$(THSRC),$(SRCDIR)$(sf)) |
| 101 | THOBJ=$(foreach sf,$(THSRC),$(sf:.c=.obj)) |
| 102 |
+2
-2
| --- win/Makefile.dmc | ||
| +++ win/Makefile.dmc | ||
| @@ -26,13 +26,13 @@ | ||
| 26 | 26 | CFLAGS = -o |
| 27 | 27 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 28 | 28 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 29 | 29 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi |
| 30 | 30 | |
| 31 | -SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 | |
| 31 | +SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 | |
| 32 | 32 | |
| 33 | -SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | |
| 33 | +SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen | |
| 34 | 34 | |
| 35 | 35 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 36 | 36 | |
| 37 | 37 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 38 | 38 | |
| 39 | 39 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -26,13 +26,13 @@ | |
| 26 | CFLAGS = -o |
| 27 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 28 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 29 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi |
| 30 | |
| 31 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 |
| 32 | |
| 33 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_USE_ALLOCA -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_INTROSPECTION_PRAGMAS -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 34 | |
| 35 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 36 | |
| 37 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 38 | |
| 39 |
| --- win/Makefile.dmc | |
| +++ win/Makefile.dmc | |
| @@ -26,13 +26,13 @@ | |
| 26 | CFLAGS = -o |
| 27 | BCC = $(DMDIR)\bin\dmc $(CFLAGS) |
| 28 | TCC = $(DMDIR)\bin\dmc $(CFLAGS) $(DMCDEF) $(SSL) $(INCL) |
| 29 | LIBS = $(DMDIR)\extra\lib\ zlib wsock32 advapi32 dnsapi |
| 30 | |
| 31 | SQLITE_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 |
| 32 | |
| 33 | SHELL_OPTIONS = -DNDEBUG=1 -DSQLITE_DQS=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_MEMSTATUS=0 -DSQLITE_DEFAULT_WAL_SYNCHRONOUS=1 -DSQLITE_LIKE_DOESNT_MATCH_BLOBS -DSQLITE_OMIT_DECLTYPE -DSQLITE_OMIT_DEPRECATED -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_SHARED_CACHE -DSQLITE_OMIT_LOAD_EXTENSION -DSQLITE_MAX_EXPR_DEPTH=0 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_DBSTAT_VTAB -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_STMTVTAB -DSQLITE_HAVE_ZLIB -DSQLITE_ENABLE_DBPAGE_VTAB -DSQLITE_TRUSTED_SCHEMA=0 -Dmain=sqlite3_shell -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) -DSQLITE_SHELL_DBNAME_PROC=sqlcmd_get_dbname -DSQLITE_SHELL_INIT_PROC=sqlcmd_init_proc -Daccess=file_access -Dsystem=fossil_system -Dgetenv=fossil_getenv -Dfopen=fossil_fopen |
| 34 | |
| 35 | SRC = add_.c ajax_.c alerts_.c allrepo_.c attach_.c backlink_.c backoffice_.c bag_.c bisect_.c blob_.c branch_.c browse_.c builtin_.c bundle_.c cache_.c capabilities_.c captcha_.c cgi_.c chat_.c checkin_.c checkout_.c clearsign_.c clone_.c color_.c comformat_.c configure_.c content_.c cookies_.c db_.c delta_.c deltacmd_.c deltafunc_.c descendants_.c diff_.c diffcmd_.c dispatch_.c doc_.c encode_.c etag_.c event_.c export_.c extcgi_.c file_.c fileedit_.c finfo_.c foci_.c forum_.c fshell_.c fusefs_.c fuzz_.c glob_.c graph_.c gzip_.c hname_.c hook_.c http_.c http_socket_.c http_ssl_.c http_transport_.c import_.c info_.c interwiki_.c json_.c json_artifact_.c json_branch_.c json_config_.c json_diff_.c json_dir_.c json_finfo_.c json_login_.c json_query_.c json_report_.c json_status_.c json_tag_.c json_timeline_.c json_user_.c json_wiki_.c leaf_.c loadctrl_.c login_.c lookslike_.c main_.c manifest_.c markdown_.c markdown_html_.c md5_.c merge_.c merge3_.c moderate_.c name_.c patch_.c path_.c piechart_.c pikchrshow_.c pivot_.c popen_.c pqueue_.c printf_.c publish_.c purge_.c rebuild_.c regexp_.c repolist_.c report_.c rss_.c schema_.c search_.c security_audit_.c setup_.c setupuser_.c sha1_.c sha1hard_.c sha3_.c shun_.c sitemap_.c skins_.c smtp_.c sqlcmd_.c stash_.c stat_.c statrep_.c style_.c sync_.c tag_.c tar_.c terminal_.c th_main_.c timeline_.c tkt_.c tktsetup_.c undo_.c unicode_.c unversioned_.c update_.c url_.c user_.c utf8_.c util_.c verify_.c vfile_.c wiki_.c wikiformat_.c winfile_.c winhttp_.c xfer_.c xfersetup_.c zip_.c |
| 36 | |
| 37 | OBJ = $(OBJDIR)\add$O $(OBJDIR)\ajax$O $(OBJDIR)\alerts$O $(OBJDIR)\allrepo$O $(OBJDIR)\attach$O $(OBJDIR)\backlink$O $(OBJDIR)\backoffice$O $(OBJDIR)\bag$O $(OBJDIR)\bisect$O $(OBJDIR)\blob$O $(OBJDIR)\branch$O $(OBJDIR)\browse$O $(OBJDIR)\builtin$O $(OBJDIR)\bundle$O $(OBJDIR)\cache$O $(OBJDIR)\capabilities$O $(OBJDIR)\captcha$O $(OBJDIR)\cgi$O $(OBJDIR)\chat$O $(OBJDIR)\checkin$O $(OBJDIR)\checkout$O $(OBJDIR)\clearsign$O $(OBJDIR)\clone$O $(OBJDIR)\color$O $(OBJDIR)\comformat$O $(OBJDIR)\configure$O $(OBJDIR)\content$O $(OBJDIR)\cookies$O $(OBJDIR)\db$O $(OBJDIR)\delta$O $(OBJDIR)\deltacmd$O $(OBJDIR)\deltafunc$O $(OBJDIR)\descendants$O $(OBJDIR)\diff$O $(OBJDIR)\diffcmd$O $(OBJDIR)\dispatch$O $(OBJDIR)\doc$O $(OBJDIR)\encode$O $(OBJDIR)\etag$O $(OBJDIR)\event$O $(OBJDIR)\export$O $(OBJDIR)\extcgi$O $(OBJDIR)\file$O $(OBJDIR)\fileedit$O $(OBJDIR)\finfo$O $(OBJDIR)\foci$O $(OBJDIR)\forum$O $(OBJDIR)\fshell$O $(OBJDIR)\fusefs$O $(OBJDIR)\fuzz$O $(OBJDIR)\glob$O $(OBJDIR)\graph$O $(OBJDIR)\gzip$O $(OBJDIR)\hname$O $(OBJDIR)\hook$O $(OBJDIR)\http$O $(OBJDIR)\http_socket$O $(OBJDIR)\http_ssl$O $(OBJDIR)\http_transport$O $(OBJDIR)\import$O $(OBJDIR)\info$O $(OBJDIR)\interwiki$O $(OBJDIR)\json$O $(OBJDIR)\json_artifact$O $(OBJDIR)\json_branch$O $(OBJDIR)\json_config$O $(OBJDIR)\json_diff$O $(OBJDIR)\json_dir$O $(OBJDIR)\json_finfo$O $(OBJDIR)\json_login$O $(OBJDIR)\json_query$O $(OBJDIR)\json_report$O $(OBJDIR)\json_status$O $(OBJDIR)\json_tag$O $(OBJDIR)\json_timeline$O $(OBJDIR)\json_user$O $(OBJDIR)\json_wiki$O $(OBJDIR)\leaf$O $(OBJDIR)\loadctrl$O $(OBJDIR)\login$O $(OBJDIR)\lookslike$O $(OBJDIR)\main$O $(OBJDIR)\manifest$O $(OBJDIR)\markdown$O $(OBJDIR)\markdown_html$O $(OBJDIR)\md5$O $(OBJDIR)\merge$O $(OBJDIR)\merge3$O $(OBJDIR)\moderate$O $(OBJDIR)\name$O $(OBJDIR)\patch$O $(OBJDIR)\path$O $(OBJDIR)\piechart$O $(OBJDIR)\pikchrshow$O $(OBJDIR)\pivot$O $(OBJDIR)\popen$O $(OBJDIR)\pqueue$O $(OBJDIR)\printf$O $(OBJDIR)\publish$O $(OBJDIR)\purge$O $(OBJDIR)\rebuild$O $(OBJDIR)\regexp$O $(OBJDIR)\repolist$O $(OBJDIR)\report$O $(OBJDIR)\rss$O $(OBJDIR)\schema$O $(OBJDIR)\search$O $(OBJDIR)\security_audit$O $(OBJDIR)\setup$O $(OBJDIR)\setupuser$O $(OBJDIR)\sha1$O $(OBJDIR)\sha1hard$O $(OBJDIR)\sha3$O $(OBJDIR)\shun$O $(OBJDIR)\sitemap$O $(OBJDIR)\skins$O $(OBJDIR)\smtp$O $(OBJDIR)\sqlcmd$O $(OBJDIR)\stash$O $(OBJDIR)\stat$O $(OBJDIR)\statrep$O $(OBJDIR)\style$O $(OBJDIR)\sync$O $(OBJDIR)\tag$O $(OBJDIR)\tar$O $(OBJDIR)\terminal$O $(OBJDIR)\th_main$O $(OBJDIR)\timeline$O $(OBJDIR)\tkt$O $(OBJDIR)\tktsetup$O $(OBJDIR)\undo$O $(OBJDIR)\unicode$O $(OBJDIR)\unversioned$O $(OBJDIR)\update$O $(OBJDIR)\url$O $(OBJDIR)\user$O $(OBJDIR)\utf8$O $(OBJDIR)\util$O $(OBJDIR)\verify$O $(OBJDIR)\vfile$O $(OBJDIR)\wiki$O $(OBJDIR)\wikiformat$O $(OBJDIR)\winfile$O $(OBJDIR)\winhttp$O $(OBJDIR)\xfer$O $(OBJDIR)\xfersetup$O $(OBJDIR)\zip$O $(OBJDIR)\shell$O $(OBJDIR)\sqlite3$O $(OBJDIR)\th$O $(OBJDIR)\th_lang$O |
| 38 | |
| 39 |
-6
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -2512,21 +2512,18 @@ | ||
| 2512 | 2512 | -DSQLITE_OMIT_DEPRECATED \ |
| 2513 | 2513 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 2514 | 2514 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 2515 | 2515 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 2516 | 2516 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 2517 | - -DSQLITE_USE_ALLOCA \ | |
| 2518 | 2517 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 2519 | 2518 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2520 | 2519 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2521 | 2520 | -DSQLITE_ENABLE_FTS4 \ |
| 2522 | 2521 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2523 | - -DSQLITE_ENABLE_JSON1 \ | |
| 2524 | 2522 | -DSQLITE_ENABLE_FTS5 \ |
| 2525 | 2523 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2526 | 2524 | -DSQLITE_HAVE_ZLIB \ |
| 2527 | - -DSQLITE_INTROSPECTION_PRAGMAS \ | |
| 2528 | 2525 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2529 | 2526 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2530 | 2527 | -DSQLITE_WIN32_NO_ANSI \ |
| 2531 | 2528 | $(MINGW_OPTIONS) \ |
| 2532 | 2529 | -DSQLITE_USE_MALLOC_H \ |
| @@ -2542,21 +2539,18 @@ | ||
| 2542 | 2539 | -DSQLITE_OMIT_DEPRECATED \ |
| 2543 | 2540 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 2544 | 2541 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 2545 | 2542 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 2546 | 2543 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 2547 | - -DSQLITE_USE_ALLOCA \ | |
| 2548 | 2544 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 2549 | 2545 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2550 | 2546 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2551 | 2547 | -DSQLITE_ENABLE_FTS4 \ |
| 2552 | 2548 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2553 | - -DSQLITE_ENABLE_JSON1 \ | |
| 2554 | 2549 | -DSQLITE_ENABLE_FTS5 \ |
| 2555 | 2550 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2556 | 2551 | -DSQLITE_HAVE_ZLIB \ |
| 2557 | - -DSQLITE_INTROSPECTION_PRAGMAS \ | |
| 2558 | 2552 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2559 | 2553 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2560 | 2554 | -Dmain=sqlite3_shell \ |
| 2561 | 2555 | -DSQLITE_SHELL_IS_UTF8=1 \ |
| 2562 | 2556 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 2563 | 2557 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -2512,21 +2512,18 @@ | |
| 2512 | -DSQLITE_OMIT_DEPRECATED \ |
| 2513 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 2514 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 2515 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 2516 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 2517 | -DSQLITE_USE_ALLOCA \ |
| 2518 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 2519 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2520 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2521 | -DSQLITE_ENABLE_FTS4 \ |
| 2522 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2523 | -DSQLITE_ENABLE_JSON1 \ |
| 2524 | -DSQLITE_ENABLE_FTS5 \ |
| 2525 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2526 | -DSQLITE_HAVE_ZLIB \ |
| 2527 | -DSQLITE_INTROSPECTION_PRAGMAS \ |
| 2528 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2529 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2530 | -DSQLITE_WIN32_NO_ANSI \ |
| 2531 | $(MINGW_OPTIONS) \ |
| 2532 | -DSQLITE_USE_MALLOC_H \ |
| @@ -2542,21 +2539,18 @@ | |
| 2542 | -DSQLITE_OMIT_DEPRECATED \ |
| 2543 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 2544 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 2545 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 2546 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 2547 | -DSQLITE_USE_ALLOCA \ |
| 2548 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 2549 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2550 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2551 | -DSQLITE_ENABLE_FTS4 \ |
| 2552 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2553 | -DSQLITE_ENABLE_JSON1 \ |
| 2554 | -DSQLITE_ENABLE_FTS5 \ |
| 2555 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2556 | -DSQLITE_HAVE_ZLIB \ |
| 2557 | -DSQLITE_INTROSPECTION_PRAGMAS \ |
| 2558 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2559 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2560 | -Dmain=sqlite3_shell \ |
| 2561 | -DSQLITE_SHELL_IS_UTF8=1 \ |
| 2562 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 2563 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -2512,21 +2512,18 @@ | |
| 2512 | -DSQLITE_OMIT_DEPRECATED \ |
| 2513 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 2514 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 2515 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 2516 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 2517 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 2518 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2519 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2520 | -DSQLITE_ENABLE_FTS4 \ |
| 2521 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2522 | -DSQLITE_ENABLE_FTS5 \ |
| 2523 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2524 | -DSQLITE_HAVE_ZLIB \ |
| 2525 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2526 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2527 | -DSQLITE_WIN32_NO_ANSI \ |
| 2528 | $(MINGW_OPTIONS) \ |
| 2529 | -DSQLITE_USE_MALLOC_H \ |
| @@ -2542,21 +2539,18 @@ | |
| 2539 | -DSQLITE_OMIT_DEPRECATED \ |
| 2540 | -DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 2541 | -DSQLITE_OMIT_SHARED_CACHE \ |
| 2542 | -DSQLITE_OMIT_LOAD_EXTENSION \ |
| 2543 | -DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 2544 | -DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 2545 | -DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 2546 | -DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 2547 | -DSQLITE_ENABLE_FTS4 \ |
| 2548 | -DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 2549 | -DSQLITE_ENABLE_FTS5 \ |
| 2550 | -DSQLITE_ENABLE_STMTVTAB \ |
| 2551 | -DSQLITE_HAVE_ZLIB \ |
| 2552 | -DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 2553 | -DSQLITE_TRUSTED_SCHEMA=0 \ |
| 2554 | -Dmain=sqlite3_shell \ |
| 2555 | -DSQLITE_SHELL_IS_UTF8=1 \ |
| 2556 | -DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 2557 |
-6
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -299,21 +299,18 @@ | ||
| 299 | 299 | /DSQLITE_OMIT_DEPRECATED \ |
| 300 | 300 | /DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 301 | 301 | /DSQLITE_OMIT_SHARED_CACHE \ |
| 302 | 302 | /DSQLITE_OMIT_LOAD_EXTENSION \ |
| 303 | 303 | /DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 304 | - /DSQLITE_USE_ALLOCA \ | |
| 305 | 304 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 306 | 305 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 307 | 306 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 308 | 307 | /DSQLITE_ENABLE_FTS4 \ |
| 309 | 308 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 310 | - /DSQLITE_ENABLE_JSON1 \ | |
| 311 | 309 | /DSQLITE_ENABLE_FTS5 \ |
| 312 | 310 | /DSQLITE_ENABLE_STMTVTAB \ |
| 313 | 311 | /DSQLITE_HAVE_ZLIB \ |
| 314 | - /DSQLITE_INTROSPECTION_PRAGMAS \ | |
| 315 | 312 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 316 | 313 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 317 | 314 | /DSQLITE_WIN32_NO_ANSI |
| 318 | 315 | |
| 319 | 316 | SHELL_OPTIONS = /DNDEBUG=1 \ |
| @@ -326,21 +323,18 @@ | ||
| 326 | 323 | /DSQLITE_OMIT_DEPRECATED \ |
| 327 | 324 | /DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 328 | 325 | /DSQLITE_OMIT_SHARED_CACHE \ |
| 329 | 326 | /DSQLITE_OMIT_LOAD_EXTENSION \ |
| 330 | 327 | /DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 331 | - /DSQLITE_USE_ALLOCA \ | |
| 332 | 328 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 333 | 329 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 334 | 330 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 335 | 331 | /DSQLITE_ENABLE_FTS4 \ |
| 336 | 332 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 337 | - /DSQLITE_ENABLE_JSON1 \ | |
| 338 | 333 | /DSQLITE_ENABLE_FTS5 \ |
| 339 | 334 | /DSQLITE_ENABLE_STMTVTAB \ |
| 340 | 335 | /DSQLITE_HAVE_ZLIB \ |
| 341 | - /DSQLITE_INTROSPECTION_PRAGMAS \ | |
| 342 | 336 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 343 | 337 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 344 | 338 | /Dmain=sqlite3_shell \ |
| 345 | 339 | /DSQLITE_SHELL_IS_UTF8=1 \ |
| 346 | 340 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 347 | 341 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -299,21 +299,18 @@ | |
| 299 | /DSQLITE_OMIT_DEPRECATED \ |
| 300 | /DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 301 | /DSQLITE_OMIT_SHARED_CACHE \ |
| 302 | /DSQLITE_OMIT_LOAD_EXTENSION \ |
| 303 | /DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 304 | /DSQLITE_USE_ALLOCA \ |
| 305 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 306 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 307 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 308 | /DSQLITE_ENABLE_FTS4 \ |
| 309 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 310 | /DSQLITE_ENABLE_JSON1 \ |
| 311 | /DSQLITE_ENABLE_FTS5 \ |
| 312 | /DSQLITE_ENABLE_STMTVTAB \ |
| 313 | /DSQLITE_HAVE_ZLIB \ |
| 314 | /DSQLITE_INTROSPECTION_PRAGMAS \ |
| 315 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 316 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 317 | /DSQLITE_WIN32_NO_ANSI |
| 318 | |
| 319 | SHELL_OPTIONS = /DNDEBUG=1 \ |
| @@ -326,21 +323,18 @@ | |
| 326 | /DSQLITE_OMIT_DEPRECATED \ |
| 327 | /DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 328 | /DSQLITE_OMIT_SHARED_CACHE \ |
| 329 | /DSQLITE_OMIT_LOAD_EXTENSION \ |
| 330 | /DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 331 | /DSQLITE_USE_ALLOCA \ |
| 332 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 333 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 334 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 335 | /DSQLITE_ENABLE_FTS4 \ |
| 336 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 337 | /DSQLITE_ENABLE_JSON1 \ |
| 338 | /DSQLITE_ENABLE_FTS5 \ |
| 339 | /DSQLITE_ENABLE_STMTVTAB \ |
| 340 | /DSQLITE_HAVE_ZLIB \ |
| 341 | /DSQLITE_INTROSPECTION_PRAGMAS \ |
| 342 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 343 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 344 | /Dmain=sqlite3_shell \ |
| 345 | /DSQLITE_SHELL_IS_UTF8=1 \ |
| 346 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 347 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -299,21 +299,18 @@ | |
| 299 | /DSQLITE_OMIT_DEPRECATED \ |
| 300 | /DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 301 | /DSQLITE_OMIT_SHARED_CACHE \ |
| 302 | /DSQLITE_OMIT_LOAD_EXTENSION \ |
| 303 | /DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 304 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 305 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 306 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 307 | /DSQLITE_ENABLE_FTS4 \ |
| 308 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 309 | /DSQLITE_ENABLE_FTS5 \ |
| 310 | /DSQLITE_ENABLE_STMTVTAB \ |
| 311 | /DSQLITE_HAVE_ZLIB \ |
| 312 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 313 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 314 | /DSQLITE_WIN32_NO_ANSI |
| 315 | |
| 316 | SHELL_OPTIONS = /DNDEBUG=1 \ |
| @@ -326,21 +323,18 @@ | |
| 323 | /DSQLITE_OMIT_DEPRECATED \ |
| 324 | /DSQLITE_OMIT_PROGRESS_CALLBACK \ |
| 325 | /DSQLITE_OMIT_SHARED_CACHE \ |
| 326 | /DSQLITE_OMIT_LOAD_EXTENSION \ |
| 327 | /DSQLITE_MAX_EXPR_DEPTH=0 \ |
| 328 | /DSQLITE_ENABLE_LOCKING_STYLE=0 \ |
| 329 | /DSQLITE_DEFAULT_FILE_FORMAT=4 \ |
| 330 | /DSQLITE_ENABLE_EXPLAIN_COMMENTS \ |
| 331 | /DSQLITE_ENABLE_FTS4 \ |
| 332 | /DSQLITE_ENABLE_DBSTAT_VTAB \ |
| 333 | /DSQLITE_ENABLE_FTS5 \ |
| 334 | /DSQLITE_ENABLE_STMTVTAB \ |
| 335 | /DSQLITE_HAVE_ZLIB \ |
| 336 | /DSQLITE_ENABLE_DBPAGE_VTAB \ |
| 337 | /DSQLITE_TRUSTED_SCHEMA=0 \ |
| 338 | /Dmain=sqlite3_shell \ |
| 339 | /DSQLITE_SHELL_IS_UTF8=1 \ |
| 340 | /DSQLITE_OMIT_LOAD_EXTENSION=1 \ |
| 341 |