Fossil SCM

When building an SEE-enabled build with MSVC, be sure to define SQLITE_HAS_CODEC.

mistachkin 2017-05-28 19:44 trunk
Commit fa6b22c674c71122e6ec1a6f2d276ebdb1657769cce222fae3fd8fefd2a2b84f
Parent 9766cfd5a330c7d…
2 files changed +4 -6 +4 -6
~ src/makemake.tcl ~ win/Makefile.msc
M src/makemake.tcl
+4 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1850,24 +1850,22 @@
18501850
18511851
 codecheck1$E: $(SRCDIR)\codecheck1.c
18521852
 $(BCC) $**
18531853
18541854
 !if $(USE_SEE)!=0
1855
+SEE_FLAGS = /DSQLITE_HAS_CODEC=1
18551856
 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1857
+SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
18561858
 !else
1859
+SEE_FLAGS =
18571860
 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
1861
+SQLITE3_SRC = $(SRCDIR)\sqlite3.c
18581862
 !endif
18591863
18601864
 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
18611865
 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC)
18621866
1863
-!if $(USE_SEE)!=0
1864
-SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1865
-!else
1866
-SQLITE3_SRC = $(SRCDIR)\sqlite3.c
1867
-!endif
1868
-
18691867
 $(OX)\sqlite3$O : $(SQLITE3_SRC) $B\win\Makefile.msc
18701868
 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) $(SQLITE3_SRC)
18711869
18721870
 $(OX)\th$O : $(SRCDIR)\th.c
18731871
 $(TCC) /Fo$@ -c $**
18741872
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1850,24 +1850,22 @@
1850
1851 codecheck1$E: $(SRCDIR)\codecheck1.c
1852 $(BCC) $**
1853
1854 !if $(USE_SEE)!=0
 
1855 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
 
1856 !else
 
1857 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
 
1858 !endif
1859
1860 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
1861 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC)
1862
1863 !if $(USE_SEE)!=0
1864 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1865 !else
1866 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
1867 !endif
1868
1869 $(OX)\sqlite3$O : $(SQLITE3_SRC) $B\win\Makefile.msc
1870 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) $(SQLITE3_SRC)
1871
1872 $(OX)\th$O : $(SRCDIR)\th.c
1873 $(TCC) /Fo$@ -c $**
1874
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -1850,24 +1850,22 @@
1850
1851 codecheck1$E: $(SRCDIR)\codecheck1.c
1852 $(BCC) $**
1853
1854 !if $(USE_SEE)!=0
1855 SEE_FLAGS = /DSQLITE_HAS_CODEC=1
1856 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1857 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
1858 !else
1859 SEE_FLAGS =
1860 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
1861 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
1862 !endif
1863
1864 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
1865 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC)
1866
 
 
 
 
 
 
1867 $(OX)\sqlite3$O : $(SQLITE3_SRC) $B\win\Makefile.msc
1868 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) $(SQLITE3_SRC)
1869
1870 $(OX)\th$O : $(SRCDIR)\th.c
1871 $(TCC) /Fo$@ -c $**
1872
M win/Makefile.msc
+4 -6
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -867,24 +867,22 @@
867867
868868
 codecheck1$E: $(SRCDIR)\codecheck1.c
869869
 $(BCC) $**
870870
871871
 !if $(USE_SEE)!=0
872
+SEE_FLAGS = /DSQLITE_HAS_CODEC=1
872873
 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
874
+SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
873875
 !else
876
+SEE_FLAGS =
874877
 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
878
+SQLITE3_SRC = $(SRCDIR)\sqlite3.c
875879
 !endif
876880
877881
 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
878882
 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC)
879883
880
-!if $(USE_SEE)!=0
881
-SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
882
-!else
883
-SQLITE3_SRC = $(SRCDIR)\sqlite3.c
884
-!endif
885
-
886884
 $(OX)\sqlite3$O : $(SQLITE3_SRC) $B\win\Makefile.msc
887885
 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) $(SQLITE3_SRC)
888886
889887
 $(OX)\th$O : $(SRCDIR)\th.c
890888
 $(TCC) /Fo$@ -c $**
891889
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -867,24 +867,22 @@
867
868 codecheck1$E: $(SRCDIR)\codecheck1.c
869 $(BCC) $**
870
871 !if $(USE_SEE)!=0
 
872 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
 
873 !else
 
874 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
 
875 !endif
876
877 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
878 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC)
879
880 !if $(USE_SEE)!=0
881 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
882 !else
883 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
884 !endif
885
886 $(OX)\sqlite3$O : $(SQLITE3_SRC) $B\win\Makefile.msc
887 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) $(SQLITE3_SRC)
888
889 $(OX)\th$O : $(SRCDIR)\th.c
890 $(TCC) /Fo$@ -c $**
891
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -867,24 +867,22 @@
867
868 codecheck1$E: $(SRCDIR)\codecheck1.c
869 $(BCC) $**
870
871 !if $(USE_SEE)!=0
872 SEE_FLAGS = /DSQLITE_HAS_CODEC=1
873 SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
874 SQLITE3_SRC = $(SRCDIR)\sqlite3-see.c
875 !else
876 SEE_FLAGS =
877 SQLITE3_SHELL_SRC = $(SRCDIR)\shell.c
878 SQLITE3_SRC = $(SRCDIR)\sqlite3.c
879 !endif
880
881 $(OX)\shell$O : $(SQLITE3_SHELL_SRC) $B\win\Makefile.msc
882 $(TCC) /Fo$@ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC)
883
 
 
 
 
 
 
884 $(OX)\sqlite3$O : $(SQLITE3_SRC) $B\win\Makefile.msc
885 $(TCC) /Fo$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) $(SQLITE3_SRC)
886
887 $(OX)\th$O : $(SRCDIR)\th.c
888 $(TCC) /Fo$@ -c $**
889

Keyboard Shortcuts

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