Merge pull request #5348 from n-stein/fix(#5302)

fix(#5302): update wxsqlite3 submodule
moneymanagerex · Nov 19, 2022 · 501d3de · 501d3de
2 parents daee60d + 481ef06
commit 501d3de
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 10 deletions.
diff --git a/3rd/CMakeLists.txt b/3rd/CMakeLists.txt
@@ -163,13 +163,8 @@ if(NOT wxSQLite3_FOUND OR NOT (WXSQLITE3_HAVE_CODEC OR MMEX_ENCRYPTION_OPTIONAL)
         wxSQLite3_VERSION LIMIT_COUNT 1
             REGEX "#define WXSQLITE3_VERSION_STRING[\t ]+\"[^\"]+ [0-9.]+\"")
     string(REGEX REPLACE ".+\"[^\"]+ ([0-9.]+)\".*" \\1 wxSQLite3_VERSION ${wxSQLite3_VERSION})
-    if(wxSQLite3_VERSION VERSION_LESS 4)
-        set(sqlite3_dir sqlite3/secure)
-    else()
-        set(sqlite3_dir sqlite3secure)
-    endif()
-    add_library(SQLite3 STATIC EXCLUDE_FROM_ALL wxsqlite3/${sqlite3_dir}/src/sqlite3secure.c)
-    target_include_directories(SQLite3 SYSTEM PUBLIC wxsqlite3/${sqlite3_dir}/src)
+    add_library(SQLite3 STATIC EXCLUDE_FROM_ALL wxsqlite3/src/sqlite3mc_amalgamation.c)
+    target_include_directories(SQLite3 SYSTEM PUBLIC wxsqlite3/src)
 
     if(LINUX)
         include(CheckLibraryExists)

diff --git a/3rd/wxsqlite3 b/3rd/wxsqlite3
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
@@ -21,7 +21,7 @@
 #include "paths.h"
 #include "constants.h"
 //----------------------------------------------------------------------------
-#include "sqlite3.h"
+#include "sqlite3mc_amalgamation.h"
 //----------------------------------------------------------------------------
 /*
     SQLITE_OPEN_READWRITE

diff --git a/src/model/Model_Report.cpp b/src/model/Model_Report.cpp
@@ -26,7 +26,7 @@
 #include "reports/htmlbuilder.h"
 #include "model/Model_Setting.h"
 #include "LuaGlue/LuaGlue.h"
-#include "sqlite3.h"
+#include "sqlite3mc_amalgamation.h"
 #include <wx/fs_mem.h>
 
 #if defined (__WXMSW__)