From 6ea9c7910b6425234d384dfa1c4b14a9847d1646 Mon Sep 17 00:00:00 2001
From: Stephen Lombardo <sjlombardo@zetetic.net>
Date: Mon, 4 Apr 2022 12:19:49 -0400
Subject: [PATCH] change compilation / amalgamation order of sqlcipher sources

---
 Makefile.in         |  4 ++--
 Makefile.msc        | 18 +++++++++---------
 tool/mksqlite3c.tcl | 18 +++++++++---------
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ad4be7b8..e56cb546 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -228,7 +228,6 @@ LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
 # All of the source code files.
 #
 SRC = \
-  $(CRYPTOSRC) \
   $(TOP)/src/alter.c \
   $(TOP)/src/analyze.c \
   $(TOP)/src/attach.c \
@@ -331,7 +330,8 @@ SRC = \
   $(TOP)/src/wherecode.c \
   $(TOP)/src/whereexpr.c \
   $(TOP)/src/whereInt.h \
-  $(TOP)/src/window.c
+  $(TOP)/src/window.c \
+  $(CRYPTOSRC)
 
 # Source code for extensions
 #
diff --git a/Makefile.msc b/Makefile.msc
index 49e7daa7..5ef9a3dd 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1292,14 +1292,6 @@ LIBRESOBJS =
 # Core source code files, part 1.
 #
 SRC00 = \
-	$(TOP)\src\crypto.c \
-	$(TOP)\src\crypto_cc.c \
-	$(TOP)\src\crypto_impl.c \
-	$(TOP)\src\crypto_libtomcrypt.c \
-	$(TOP)\src\crypto_nss.c \
-	$(TOP)\src\crypto_openssl.c \
-	$(TOP)\src\crypto.h \
-	$(TOP)\src\sqlcipher.h \
   $(TOP)\src\alter.c \
   $(TOP)\src\analyze.c \
   $(TOP)\src\attach.c \
@@ -1382,7 +1374,15 @@ SRC01 = \
   $(TOP)\src\where.c \
   $(TOP)\src\wherecode.c \
   $(TOP)\src\whereexpr.c \
-  $(TOP)\src\window.c
+  $(TOP)\src\window.c \
+  $(TOP)\src\crypto.c \
+  $(TOP)\src\crypto_cc.c \
+  $(TOP)\src\crypto_impl.c \
+  $(TOP)\src\crypto_libtomcrypt.c \
+  $(TOP)\src\crypto_nss.c \
+  $(TOP)\src\crypto_openssl.c \
+  $(TOP)\src\crypto.h \
+  $(TOP)\src\sqlcipher.h 
 
 # Core miscellaneous files.
 #
diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index ac12fe27..77d14ca8 100644
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -128,8 +128,6 @@ close $in
 # text of the file in-line.  The file only needs to be included once.
 #
 foreach hdr {
-   crypto.h
-   sqlcipher.h
    btree.h
    btreeInt.h
    fts3.h
@@ -164,6 +162,8 @@ foreach hdr {
    vxworks.h
    wal.h
    whereInt.h
+   crypto.h
+   sqlcipher.h
 } {
   set available_hdr($hdr) 1
 }
@@ -332,13 +332,6 @@ foreach file {
    os_common.h
    ctime.c
 
-   crypto.c
-   crypto_impl.c
-   crypto_libtomcrypt.c
-   crypto_nss.c
-   crypto_openssl.c
-   crypto_cc.c
-
    global.c
    status.c
    date.c
@@ -450,6 +443,13 @@ foreach file {
    sqlite3session.c
    fts5.c
    stmt.c
+
+   crypto.c
+   crypto_impl.c
+   crypto_libtomcrypt.c
+   crypto_nss.c
+   crypto_openssl.c
+   crypto_cc.c
 } {
   copy_file $srcdir/$file
 }
-- 
2.11.4.GIT