Fossil SCM

Follow-up to [3ba28b23a4d7626691b56debae4add06cd24d4ca|3ba28b23a4]: Eliminate unnecessary calls to sqlite3_win32_is_nt(), but now for MSC and PellesC as well.

jan.nijtmans 2014-08-07 07:13 UTC trunk
Commit ffa67c1b9b61264f2c89f3ded9a1d4f015884fce
Parent d600c9f85421c09…
5 files changed +6 -4 +1 -1 +2 -2 +2 -2 +2 -1
~ src/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+6 -4
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -827,15 +827,17 @@
827827
 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
828828
 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
829829
 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
830830
 }
831831
832
-set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
832
+set SQLITE_WIN32_OPTIONS $SQLITE_OPTIONS
833
+lappend SQLITE_WIN32_OPTIONS -DSQLITE_WIN32_NO_ANSI
834
+
835
+set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
833836
 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834837
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835838
 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
836
-lappend MINGW_SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
837839
838840
 set j " \\\n "
839841
 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
840842
 set j " \\\n "
841843
 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
@@ -1125,11 +1127,11 @@
11251127
 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
11261128
 TCC = $(TCC) /DUSE_TCL_STUBS=1
11271129
 RCC = $(RCC) /DUSE_TCL_STUBS=1
11281130
 !endif
11291131
 }
1130
-regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1132
+regsub -all {[-]D} [join $SQLITE_WIN32_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
11311133
 set j " \\\n "
11321134
 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
11331135
11341136
 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
11351137
 set j " \\\n "
@@ -1296,11 +1298,11 @@
12961298
 puts "building ../win/Makefile.PellesCGMake"
12971299
 set output_file [open ../win/Makefile.PellesCGMake w]
12981300
 fconfigure $output_file -translation binary
12991301
13001302
 writeln [string map [list \
1301
- <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1303
+ <<<SQLITE_OPTIONS>>> [join $SQLITE_WIN32_OPTIONS { }] \
13021304
 <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
13031305
 ##############################################################################
13041306
 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
13051307
 ##############################################################################
13061308
 #
13071309
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -827,15 +827,17 @@
827 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
828 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
829 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
830 }
831
832 set MINGW_SQLITE_OPTIONS $SQLITE_OPTIONS
 
 
 
833 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
834 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
835 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
836 lappend MINGW_SQLITE_OPTIONS -DSQLITE_WIN32_NO_ANSI
837
838 set j " \\\n "
839 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
840 set j " \\\n "
841 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
@@ -1125,11 +1127,11 @@
1125 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
1126 TCC = $(TCC) /DUSE_TCL_STUBS=1
1127 RCC = $(RCC) /DUSE_TCL_STUBS=1
1128 !endif
1129 }
1130 regsub -all {[-]D} [join $SQLITE_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1131 set j " \\\n "
1132 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1133
1134 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1135 set j " \\\n "
@@ -1296,11 +1298,11 @@
1296 puts "building ../win/Makefile.PellesCGMake"
1297 set output_file [open ../win/Makefile.PellesCGMake w]
1298 fconfigure $output_file -translation binary
1299
1300 writeln [string map [list \
1301 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS { }] \
1302 <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
1303 ##############################################################################
1304 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1305 ##############################################################################
1306 #
1307
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -827,15 +827,17 @@
827 writeln "\$(OBJDIR)/$s.o:\t\$(OBJDIR)/${s}_.c \$(OBJDIR)/$s.h $extra_h($s) \$(SRCDIR)/config.h"
828 writeln "\t\$(XTCC) -o \$(OBJDIR)/$s.o -c \$(OBJDIR)/${s}_.c\n"
829 writeln "\$(OBJDIR)/${s}.h:\t\$(OBJDIR)/headers\n"
830 }
831
832 set SQLITE_WIN32_OPTIONS $SQLITE_OPTIONS
833 lappend SQLITE_WIN32_OPTIONS -DSQLITE_WIN32_NO_ANSI
834
835 set MINGW_SQLITE_OPTIONS $SQLITE_WIN32_OPTIONS
836 lappend MINGW_SQLITE_OPTIONS -D_HAVE__MINGW_H
837 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MALLOC_H
838 lappend MINGW_SQLITE_OPTIONS -DSQLITE_USE_MSIZE
 
839
840 set j " \\\n "
841 writeln "SQLITE_OPTIONS = [join $MINGW_SQLITE_OPTIONS $j]\n"
842 set j " \\\n "
843 writeln "SHELL_OPTIONS = [join $SHELL_WIN32_OPTIONS $j]\n"
@@ -1125,11 +1127,11 @@
1127 RCC = $(RCC) /DFOSSIL_ENABLE_TCL_PRIVATE_STUBS=1
1128 TCC = $(TCC) /DUSE_TCL_STUBS=1
1129 RCC = $(RCC) /DUSE_TCL_STUBS=1
1130 !endif
1131 }
1132 regsub -all {[-]D} [join $SQLITE_WIN32_OPTIONS { }] {/D} MSC_SQLITE_OPTIONS
1133 set j " \\\n "
1134 writeln "SQLITE_OPTIONS = [join $MSC_SQLITE_OPTIONS $j]\n"
1135
1136 regsub -all {[-]D} [join $SHELL_WIN32_OPTIONS { }] {/D} MSC_SHELL_OPTIONS
1137 set j " \\\n "
@@ -1296,11 +1298,11 @@
1298 puts "building ../win/Makefile.PellesCGMake"
1299 set output_file [open ../win/Makefile.PellesCGMake w]
1300 fconfigure $output_file -translation binary
1301
1302 writeln [string map [list \
1303 <<<SQLITE_OPTIONS>>> [join $SQLITE_WIN32_OPTIONS { }] \
1304 <<<SHELL_OPTIONS>>> [join $SHELL_WIN32_OPTIONS { }]] {#
1305 ##############################################################################
1306 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
1307 ##############################################################################
1308 #
1309
M win/Makefile.PellesCGMake
+1 -1
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
8383
8484
 # define the sqlite files, which need special flags on compile
8585
 SQLITESRC=sqlite3.c
8686
 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
8787
 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88
-SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
88
+SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI
8989
9090
 # define the sqlite shell files, which need special flags on compile
9191
 SQLITESHELLSRC=shell.c
9292
 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
9393
 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
9494
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
83
84 # define the sqlite files, which need special flags on compile
85 SQLITESRC=sqlite3.c
86 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88 SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
--- win/Makefile.PellesCGMake
+++ win/Makefile.PellesCGMake
@@ -83,11 +83,11 @@
83
84 # define the sqlite files, which need special flags on compile
85 SQLITESRC=sqlite3.c
86 ORIGSQLITESRC=$(foreach sf,$(SQLITESRC),$(SRCDIR)$(sf))
87 SQLITEOBJ=$(foreach sf,$(SQLITESRC),$(sf:.c=.obj))
88 SQLITEDEFINES=-DNDEBUG=1 -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_ENABLE_LOCKING_STYLE=0 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_OMIT_DEPRECATED -DSQLITE_ENABLE_EXPLAIN_COMMENTS -DSQLITE_WIN32_NO_ANSI
89
90 # define the sqlite shell files, which need special flags on compile
91 SQLITESHELLSRC=shell.c
92 ORIGSQLITESHELLSRC=$(foreach sf,$(SQLITESHELLSRC),$(SRCDIR)$(sf))
93 SQLITESHELLOBJ=$(foreach sf,$(SQLITESHELLSRC),$(sf:.c=.obj))
94
M win/Makefile.mingw
+2 -2
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1772,14 +1772,14 @@
17721772
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17731773
 -DSQLITE_THREADSAFE=0 \
17741774
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17751775
 -DSQLITE_OMIT_DEPRECATED \
17761776
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777
+ -DSQLITE_WIN32_NO_ANSI \
17771778
 -D_HAVE__MINGW_H \
17781779
 -DSQLITE_USE_MALLOC_H \
1779
- -DSQLITE_USE_MSIZE \
1780
- -DSQLITE_WIN32_NO_ANSI
1780
+ -DSQLITE_USE_MSIZE
17811781
17821782
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17831783
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17841784
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
17851785
 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
17861786
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1772,14 +1772,14 @@
1772 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1773 -DSQLITE_THREADSAFE=0 \
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
 
1777 -D_HAVE__MINGW_H \
1778 -DSQLITE_USE_MALLOC_H \
1779 -DSQLITE_USE_MSIZE \
1780 -DSQLITE_WIN32_NO_ANSI
1781
1782 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1783 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1784 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1785 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1786
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -1772,14 +1772,14 @@
1772 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1773 -DSQLITE_THREADSAFE=0 \
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777 -DSQLITE_WIN32_NO_ANSI \
1778 -D_HAVE__MINGW_H \
1779 -DSQLITE_USE_MALLOC_H \
1780 -DSQLITE_USE_MSIZE
 
1781
1782 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1783 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1784 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1785 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1786
M win/Makefile.mingw.mistachkin
+2 -2
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1772,14 +1772,14 @@
17721772
 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
17731773
 -DSQLITE_THREADSAFE=0 \
17741774
 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
17751775
 -DSQLITE_OMIT_DEPRECATED \
17761776
 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777
+ -DSQLITE_WIN32_NO_ANSI \
17771778
 -D_HAVE__MINGW_H \
17781779
 -DSQLITE_USE_MALLOC_H \
1779
- -DSQLITE_USE_MSIZE \
1780
- -DSQLITE_WIN32_NO_ANSI
1780
+ -DSQLITE_USE_MSIZE
17811781
17821782
 SHELL_OPTIONS = -Dmain=sqlite3_shell \
17831783
 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
17841784
 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
17851785
 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
17861786
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1772,14 +1772,14 @@
1772 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1773 -DSQLITE_THREADSAFE=0 \
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
 
1777 -D_HAVE__MINGW_H \
1778 -DSQLITE_USE_MALLOC_H \
1779 -DSQLITE_USE_MSIZE \
1780 -DSQLITE_WIN32_NO_ANSI
1781
1782 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1783 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1784 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1785 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1786
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1772,14 +1772,14 @@
1772 -DSQLITE_ENABLE_LOCKING_STYLE=0 \
1773 -DSQLITE_THREADSAFE=0 \
1774 -DSQLITE_DEFAULT_FILE_FORMAT=4 \
1775 -DSQLITE_OMIT_DEPRECATED \
1776 -DSQLITE_ENABLE_EXPLAIN_COMMENTS \
1777 -DSQLITE_WIN32_NO_ANSI \
1778 -D_HAVE__MINGW_H \
1779 -DSQLITE_USE_MALLOC_H \
1780 -DSQLITE_USE_MSIZE
 
1781
1782 SHELL_OPTIONS = -Dmain=sqlite3_shell \
1783 -DSQLITE_OMIT_LOAD_EXTENSION=1 \
1784 -DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
1785 -DSQLITE_SHELL_DBNAME_PROC=fossil_open \
1786
M win/Makefile.msc
+2 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -105,11 +105,12 @@
105105
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
106106
 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
107107
 /DSQLITE_THREADSAFE=0 \
108108
 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
109109
 /DSQLITE_OMIT_DEPRECATED \
110
- /DSQLITE_ENABLE_EXPLAIN_COMMENTS
110
+ /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
111
+ /DSQLITE_WIN32_NO_ANSI
111112
112113
 SHELL_OPTIONS = /Dmain=sqlite3_shell \
113114
 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
114115
 /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
115116
 /DSQLITE_SHELL_DBNAME_PROC=fossil_open \
116117
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -105,11 +105,12 @@
105 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
106 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
107 /DSQLITE_THREADSAFE=0 \
108 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
109 /DSQLITE_OMIT_DEPRECATED \
110 /DSQLITE_ENABLE_EXPLAIN_COMMENTS
 
111
112 SHELL_OPTIONS = /Dmain=sqlite3_shell \
113 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
114 /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
115 /DSQLITE_SHELL_DBNAME_PROC=fossil_open \
116
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -105,11 +105,12 @@
105 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
106 /DSQLITE_ENABLE_LOCKING_STYLE=0 \
107 /DSQLITE_THREADSAFE=0 \
108 /DSQLITE_DEFAULT_FILE_FORMAT=4 \
109 /DSQLITE_OMIT_DEPRECATED \
110 /DSQLITE_ENABLE_EXPLAIN_COMMENTS \
111 /DSQLITE_WIN32_NO_ANSI
112
113 SHELL_OPTIONS = /Dmain=sqlite3_shell \
114 /DSQLITE_OMIT_LOAD_EXTENSION=1 \
115 /DUSE_SYSTEM_SQLITE=$(USE_SYSTEM_SQLITE) \
116 /DSQLITE_SHELL_DBNAME_PROC=fossil_open \
117

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button