New upstream version 3.3.3+dfsg1.upstream/3.3.3+dfsg1

1 files changed, 30 insertions, 35 deletions

diff --git a/Plugins/DbSqliteWx/DbSqliteWx.pro b/Plugins/DbSqliteWx/DbSqliteWx.pro
index 6fb8406..f2f4e88 100644
--- a/Plugins/DbSqliteWx/DbSqliteWx.pro
+++ b/Plugins/DbSqliteWx/DbSqliteWx.pro
@@ -14,43 +14,23 @@ TARGET = DbSqliteWx
 TEMPLATE = lib

 

 SOURCES += dbsqlitewx.cpp \

-    dbsqlitewxinstance.cpp \

-    chacha20poly1305.c \

-    fastpbkdf2.c \

-    fileio.c \

-    md5.c \

-    rekeyvacuum.c \

-    sha1.c \

-    shathree.c \

-    test_windirent.c

-

-!unix|isEmpty(WXSQLITE_LIB) {

-    SOURCES += carray.c \

-	codec.c \

-	codecext.c \

-	csv.c \

-	extensionfunctions.c \

-	rijndael.c \

-	sha2.c \

-	sqlite3secure.c \

-	userauth.c

-}

+    dbsqlitewxinstance.cpp

 

 HEADERS += dbsqlitewx.h \

-    codec.h \

-    rijndael.h \

-    sha2.h \

-    sqlite3ext.h \

-    sqlite3userauth.h \

     dbsqlitewx_global.h \

-    dbsqlitewxinstance.h \

-    fastpbkdf2.h \

-    sha1.h \

-    sqlite3secure.h \

-    test_windirent.h

+    dbsqlitewxinstance.h

 

 DISTFILES += DbSqliteWx.json

 

+isEmpty(WXSQLITE_LIB): {

+    SOURCES += wxsqlite3.c

+    HEADERS += wxsqlite3.h

+}

+

+max: {

+    INCLUDEPATH += /usr/local/opt/openssl/include

+    LIBS += -L/usr/local/opt/openssl/lib

+}

 !macx: {

     LIBS += -L$${PWD}/../deps/lib/$${PLATFORM}/

 }

@@ -63,17 +43,32 @@ win32: {
 unix: {

     DEFINES += SQLITE_OS_UNIX=1

     !isEmpty(WXSQLITE_LIB): {

-	LIBS += $$WXSQLITE_LIB

-	DEFINES += WXSQLITE_SYSTEM_LIB

+        LIBS += $$WXSQLITE_LIB

+        DEFINES += WXSQLITE_SYSTEM_LIB

     }

 }

 win32: {

     DEFINES += SQLITE_OS_WIN=1

 }

 DEFINES += SQLITE_HAS_CODEC SQLITE_ALLOW_XTHREAD_CONNECT=1 SQLITE_THREADSAFE=1 SQLITE_TEMP_STORE=2 CODEC_TYPE=CODEC_TYPE_AES256 \

-    SQLITE_CORE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE USE_DYNAMIC_SQLITE3_LOAD=0

+    SQLITE_CORE USE_DYNAMIC_SQLITE3_LOAD=0 \

+    SQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \

+    SQLITE_ENABLE_DBSTAT_VTAB=1 \

+    SQLITE_ENABLE_BYTECODE_VTAB=1 \

+    SQLITE_ENABLE_COLUMN_METADATA=1 \

+    SQLITE_ENABLE_EXPLAIN_COMMENTS=1 \

+    SQLITE_ENABLE_FTS3=1 \

+    SQLITE_ENABLE_FTS3_PARENTHESIS=1 \

+    SQLITE_ENABLE_FTS4=1 \

+    SQLITE_ENABLE_FTS5=1 \

+    SQLITE_ENABLE_GEOPOLY=1 \

+    SQLITE_ENABLE_JSON1=1 \

+    SQLITE_ENABLE_RTREE=1 \

+    SQLITE_ENABLE_MATH_FUNCTIONS=1

 

-QMAKE_CFLAGS_WARN_ON = -Wall -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-but-set-variable -Wno-parentheses

+QMAKE_CFLAGS += -msse4.1 -msse4.2 -maes

+QMAKE_CFLAGS_WARN_ON = -Wall -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function -Wno-unused-but-set-variable \

+    -Wno-parentheses -Wno-unused-variable -Wno-unknown-pragmas

 

 OTHER_FILES += \

     dbsqlitewx.json