@@ -62,7 +62,7 @@ ifeq ($(PLATFORM),macos)
6262 FRAMEWORKS := -framework Security
6363 LDFLAGS := -dynamiclib -undefined dynamic_lookup $(FRAMEWORKS )
6464 INCLUDES += -I/opt/homebrew/include -I/usr/local/include
65- TEST_LDFLAGS := -L/opt/homebrew/lib -L/usr/local/lib -lsqlite3
65+ TEST_LDFLAGS := -L/opt/homebrew/lib -L/usr/local/lib
6666 STRIP_CMD = strip -x -S $(TARGET )
6767
6868 CURL_SSL_LIBS := -framework CoreFoundation
@@ -86,7 +86,7 @@ else ifeq ($(PLATFORM),linux)
8686 CC := gcc
8787 CXX := g++
8888 LDFLAGS := -shared -lpthread -lm -ldl
89- TEST_LDFLAGS := -lsqlite3 - lpthread -lm -ldl
89+ TEST_LDFLAGS := -lpthread -lm -ldl
9090 STRIP_CMD = strip --strip-unneeded $(TARGET )
9191 CURL_CONFIG := --with-openssl
9292 CURL_SSL_LIBS := -lssl -lcrypto
@@ -97,7 +97,7 @@ else ifeq ($(PLATFORM),windows)
9797 CXX := g++
9898 LDFLAGS := -shared -static-libgcc -lbcrypt
9999 OUTPUT_NAME := memory
100- TEST_LDFLAGS := -lsqlite3 - lbcrypt
100+ TEST_LDFLAGS := -lbcrypt
101101 STRIP_CMD = strip --strip-unneeded $(TARGET )
102102 CURL_CONFIG := --with-schannel CFLAGS="-DCURL_STATICLIB"
103103 CURL_SSL_LIBS := -lcrypt32 -lsecur32 -lws2_32
@@ -395,12 +395,9 @@ ifeq ($(OMIT_REMOTE_ENGINE),0)
395395 endif
396396endif
397397
398- # Android: compile SQLite amalgamation into unittest (set SQLITE_AMALGAM=path/to/sqlite3.c)
399- SQLITE_AMALGAM ?=
400- TEST_SQLITE_OBJ :=
401- ifneq ($(SQLITE_AMALGAM ) ,)
402- TEST_SQLITE_OBJ := $(BUILD_DIR ) /test-sqlite3.o
403- endif
398+ # Use the SQLite amalgamation in test/sqlite (compiled with extension-loading support)
399+ SQLITE_AMALGAM ?= $(TEST_DIR ) /sqlite/sqlite3.c
400+ TEST_SQLITE_OBJ := $(BUILD_DIR ) /test-sqlite3.o
404401
405402$(BUILD_DIR ) /unittest.o : $(TEST_DIR ) /unittest.c | $(BUILD_DIR )
406403 @echo " Compiling unittest.c..."
@@ -416,7 +413,7 @@ $(BUILD_DIR)/test-%.o: $(SRC_DIR)/%.m | $(BUILD_DIR)
416413
417414$(BUILD_DIR ) /test-sqlite3.o : $(SQLITE_AMALGAM ) | $(BUILD_DIR )
418415 @echo " Compiling sqlite3.c (amalgamation)..."
419- @$(CC ) $(CFLAGS ) -DSQLITE_ENABLE_FTS5 -c $< -o $@
416+ @$(CC ) $(CFLAGS ) -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_LOAD_EXTENSION - c $< -o $@
420417
421418TEST_C_OBJECTS := $(patsubst $(SRC_DIR ) /% .c,$(BUILD_DIR ) /test-% .o,$(C_SOURCES ) )
422419TEST_OBJC_OBJECTS := $(patsubst $(SRC_DIR ) /% .m,$(BUILD_DIR ) /test-% .o,$(OBJC_SOURCES ) )
0 commit comments