Skip to content

Commit 5068c89

Browse files
utelleutelle
committed
Implement enhancement request #75
The SQLite extensions COMPRESS, SQLAR, and ZIPFILE can be optionally enabled. All these extensions depend on the ZLIB library. The MINIZ library is included as a replacement for the ZLIB library, eliminating the external dependency, if desired.
1 parent 817ed2b commit 5068c89

File tree

93 files changed

+12328
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+12328
-221
lines changed

‎Makefile.am‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Process this file with automake to create Makefile.in for sqlite3mc library
22
#
3-
# Copyright (C) 2019-2020 Ulrich Telle <[email protected]>
3+
# Copyright (C) 2019-2022 Ulrich Telle <[email protected]>
44
#
55
# This file is covered by the same licence as the entire SQLite3 Multiple Ciphers package.
66

@@ -28,6 +28,13 @@ AM_CFLAGS += -std=c99 -DSQLITE_THREADSAFE=1 -DSQLITE_DQS=0 -DSQLITE_MAX_ATTACHED
2828

2929
AM_LDFLAGS = -pthread -ldl -lm
3030

31+
if HAVE_ZLIB
32+
AM_CFLAGS += -DSQLITE_HAVE_ZLIB=1
33+
AM_LDFLAGS += -lz
34+
else
35+
AM_CFLAGS += -DSQLIT3MC_USE_MINIZ=1
36+
endif
37+
3138
LDADD = lib@[email protected]
3239

3340
if USE_MSW
@@ -118,6 +125,11 @@ sqlite3shell_CFLAGS = -I$(top_srcdir)/src -std=c99 -D_GNU_SOURCE -DSQLITE_THREAD
118125
sqlite3shell_LDADD = -ldl -lm
119126
sqlite3shell_LDFLAGS = -pthread
120127

128+
if HAVE_ZLIB
129+
sqlite3shell_CFLAGS += -DSQLITE_HAVE_ZLIB=1
130+
sqlite3shell_LDADD += -lz
131+
endif
132+
121133
if USE_MSW
122134
sqlite3shell_SOURCES += src/sqlite3shell.rc
123135
sqlite3shell_LDADD += src/sqlite3shell.res_o

‎build/config.gcc‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,20 @@ CC = gcc
77
CXX = g++
88

99
# Codec type of encryption extension
10-
# Allowed values: CODEC_TYPE_AES128, CODEC_TYPE_AES256,
11-
# CODEC_TYPE_CHACHA20, CODEC_TYPE_SQLCIPHER
10+
# Allowed values: CODEC_TYPE_AES128,
11+
# CODEC_TYPE_AES256,
12+
# CODEC_TYPE_CHACHA20,
13+
# CODEC_TYPE_SQLCIPHER,
14+
# CODEC_TYPE_RC4
1215
# Default codec type is CODEC_TYPE_CHACHA20
1316
CODEC_TYPE ?= CODEC_TYPE_CHACHA20
1417

1518
# Enable SQLite debug assertions (Default: 0)
1619
# Set to 1 to enable
1720
SQLITE_ENABLE_DEBUG ?= 0
1821

22+
# Use ZLIB drop-in replacement MINIZ (Default: 0)
23+
# Set to 1 to use MINIZ
24+
SQLITE3MC_USE_MINIZ ?= 0
25+
1926
### Configuration dependent settings

‎build/sqlite3mc_dll.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES +=
22+
INCLUDES += -I../src
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_dllicu.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES += -I"$(LIBICU_PATH)/include"
22+
INCLUDES += -I../src -I"$(LIBICU_PATH)/include"
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_lib.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES +=
22+
INCLUDES += -I../src
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_libicu.make‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES += -I"$(LIBICU_PATH)/include"
22+
INCLUDES += -I../src -I"$(LIBICU_PATH)/include"
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)

‎build/sqlite3mc_shell.make‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES +=
22+
INCLUDES += -I../src
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
@@ -37,7 +37,7 @@ ifeq ($(config),debug_win32)
3737
TARGETDIR = ../bin/gcc/lib/debug
3838
TARGET = $(TARGETDIR)/sqlite3mc_shell.exe
3939
OBJDIR = obj/gcc/Win32/Debug/sqlite3mc_shell
40-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
40+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
4141
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -msse4.2 -maes
4242
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -msse4.2 -maes
4343
LIBS += ../bin/gcc/lib/debug/sqlite3mc.lib
@@ -48,7 +48,7 @@ else ifeq ($(config),debug_win64)
4848
TARGETDIR = ../bin/gcc/lib/debug
4949
TARGET = $(TARGETDIR)/sqlite3mc_shell_x64.exe
5050
OBJDIR = obj/gcc/Win64/Debug/sqlite3mc_shell
51-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
51+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
5252
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -msse4.2 -maes
5353
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -msse4.2 -maes
5454
LIBS += ../bin/gcc/lib/debug/sqlite3mc_x64.lib
@@ -59,7 +59,7 @@ else ifeq ($(config),release_win32)
5959
TARGETDIR = ../bin/gcc/lib/release
6060
TARGET = $(TARGETDIR)/sqlite3mc_shell.exe
6161
OBJDIR = obj/gcc/Win32/Release/sqlite3mc_shell
62-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
62+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
6363
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -msse4.2 -maes
6464
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -msse4.2 -maes
6565
LIBS += ../bin/gcc/lib/release/sqlite3mc.lib
@@ -70,7 +70,7 @@ else ifeq ($(config),release_win64)
7070
TARGETDIR = ../bin/gcc/lib/release
7171
TARGET = $(TARGETDIR)/sqlite3mc_shell_x64.exe
7272
OBJDIR = obj/gcc/Win64/Release/sqlite3mc_shell
73-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
73+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
7474
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -msse4.2 -maes
7575
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -msse4.2 -maes
7676
LIBS += ../bin/gcc/lib/release/sqlite3mc_x64.lib

‎build/sqlite3mc_shellicu.make‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ endif
1919
# #############################################
2020

2121
RESCOMP = windres
22-
INCLUDES +=
22+
INCLUDES += -I../src
2323
FORCE_INCLUDE +=
2424
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
2525
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
@@ -37,7 +37,7 @@ ifeq ($(config),debug_win32)
3737
TARGETDIR = ../bin/gcc/lib/debug
3838
TARGET = $(TARGETDIR)/sqlite3mc_shellicu.exe
3939
OBJDIR = obj/gcc/Win32/Debug/sqlite3mc_shellicu
40-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
40+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
4141
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g -msse4.2 -maes
4242
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g -msse4.2 -maes
4343
LIBS += ../bin/gcc/lib/debug/sqlite3mc_icu.lib -licuind -licuucd
@@ -48,7 +48,7 @@ else ifeq ($(config),debug_win64)
4848
TARGETDIR = ../bin/gcc/lib/debug
4949
TARGET = $(TARGETDIR)/sqlite3mc_shellicu_x64.exe
5050
OBJDIR = obj/gcc/Win64/Debug/sqlite3mc_shellicu
51-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
51+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DDEBUG -D_DEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
5252
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g -msse4.2 -maes
5353
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g -msse4.2 -maes
5454
LIBS += ../bin/gcc/lib/debug/sqlite3mc_icu_x64.lib -licuind -licuucd
@@ -59,7 +59,7 @@ else ifeq ($(config),release_win32)
5959
TARGETDIR = ../bin/gcc/lib/release
6060
TARGET = $(TARGETDIR)/sqlite3mc_shellicu.exe
6161
OBJDIR = obj/gcc/Win32/Release/sqlite3mc_shellicu
62-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
62+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
6363
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -msse4.2 -maes
6464
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2 -msse4.2 -maes
6565
LIBS += ../bin/gcc/lib/release/sqlite3mc_icu.lib -licuin -licuuc
@@ -70,7 +70,7 @@ else ifeq ($(config),release_win64)
7070
TARGETDIR = ../bin/gcc/lib/release
7171
TARGET = $(TARGETDIR)/sqlite3mc_shellicu_x64.exe
7272
OBJDIR = obj/gcc/Win64/Release/sqlite3mc_shellicu
73-
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
73+
DEFINES += -D_WINDOWS -DWIN32 -D_CRT_SECURE_NO_WARNINGS -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE -DNDEBUG -DSQLITE3MC_USE_MINIZ=$(SQLITE3MC_USE_MINIZ) -DSQLITE_SHELL_IS_UTF8=1 -DSQLITE_USER_AUTHENTICATION=1
7474
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -msse4.2 -maes
7575
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2 -msse4.2 -maes
7676
LIBS += ../bin/gcc/lib/release/sqlite3mc_icu_x64.lib -licuin -licuuc

‎build/sqlite3mc_vc10_dll.vcxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,14 @@
118118
<PrecompiledHeader>NotUsing</PrecompiledHeader>
119119
<WarningLevel>Level3</WarningLevel>
120120
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
121+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
121122
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
122123
<Optimization>Disabled</Optimization>
123124
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
124125
</ClCompile>
125126
<ResourceCompile>
126127
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127129
</ResourceCompile>
128130
<Link>
129131
<SubSystem>Windows</SubSystem>
@@ -137,12 +139,14 @@
137139
<PrecompiledHeader>NotUsing</PrecompiledHeader>
138140
<WarningLevel>Level3</WarningLevel>
139141
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
142+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
140143
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
141144
<Optimization>Disabled</Optimization>
142145
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
143146
</ClCompile>
144147
<ResourceCompile>
145148
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;DEBUG;_DEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
149+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
146150
</ResourceCompile>
147151
<Link>
148152
<SubSystem>Windows</SubSystem>
@@ -156,6 +160,7 @@
156160
<PrecompiledHeader>NotUsing</PrecompiledHeader>
157161
<WarningLevel>Level3</WarningLevel>
158162
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
163+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
159164
<Optimization>Full</Optimization>
160165
<FunctionLevelLinking>true</FunctionLevelLinking>
161166
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -165,6 +170,7 @@
165170
</ClCompile>
166171
<ResourceCompile>
167172
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
173+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
168174
</ResourceCompile>
169175
<Link>
170176
<SubSystem>Windows</SubSystem>
@@ -179,6 +185,7 @@
179185
<PrecompiledHeader>NotUsing</PrecompiledHeader>
180186
<WarningLevel>Level3</WarningLevel>
181187
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
188+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
182189
<Optimization>Full</Optimization>
183190
<FunctionLevelLinking>true</FunctionLevelLinking>
184191
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -188,6 +195,7 @@
188195
</ClCompile>
189196
<ResourceCompile>
190197
<PreprocessorDefinitions>_WINDOWS;WIN32;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;_USRDLL;CODEC_TYPE=$(CODEC_TYPE);SQLITE_ENABLE_DEBUG=$(SQLITE_ENABLE_DEBUG);SQLITE_THREADSAFE=1;SQLITE_DQS=0;SQLITE_MAX_ATTACHED=10;SQLITE_SOUNDEX=1;SQLITE_ENABLE_COLUMN_METADATA=1;SQLITE_SECURE_DELETE=1;SQLITE_ENABLE_DESERIALIZE=1;SQLITE_ENABLE_FTS3=1;SQLITE_ENABLE_FTS3_PARENTHESIS=1;SQLITE_ENABLE_FTS4=1;SQLITE_ENABLE_FTS5=1;SQLITE_ENABLE_RTREE=1;SQLITE_ENABLE_GEOPOLY=1;SQLITE_CORE=1;SQLITE_ENABLE_EXTFUNC=1;SQLITE_ENABLE_MATH_FUNCTIONS=1;SQLITE_ENABLE_CSV=1;SQLITE_ENABLE_VSV=1;SQLITE_ENABLE_SHA3=1;SQLITE_ENABLE_CARRAY=1;SQLITE_ENABLE_FILEIO=1;SQLITE_ENABLE_SERIES=1;SQLITE_ENABLE_UUID=1;SQLITE_ENABLE_REGEXP=1;SQLITE_TEMP_STORE=2;SQLITE_USE_URI=1;SQLITE_USER_AUTHENTICATION=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
198+
<AdditionalIncludeDirectories>..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
191199
</ResourceCompile>
192200
<Link>
193201
<SubSystem>Windows</SubSystem>
@@ -202,6 +210,7 @@
202210
<ClInclude Include="..\src\cipher_common.h" />
203211
<ClInclude Include="..\src\cipher_config.h" />
204212
<ClInclude Include="..\src\fastpbkdf2.h" />
213+
<ClInclude Include="..\src\miniz.h" />
205214
<ClInclude Include="..\src\mystdint.h" />
206215
<ClInclude Include="..\src\rijndael.h" />
207216
<ClInclude Include="..\src\sha1.h" />
@@ -214,6 +223,7 @@
214223
<ClInclude Include="..\src\sqlite3mc_vfs.h" />
215224
<ClInclude Include="..\src\sqlite3userauth.h" />
216225
<ClInclude Include="..\src\test_windirent.h" />
226+
<ClInclude Include="..\src\zlibwrap.h" />
217227
</ItemGroup>
218228
<ItemGroup>
219229
<ClCompile Include="..\src\sqlite3mc.c" />

0 commit comments

Comments
 (0)