Skip to content

Commit

Permalink
Merge pull request #96 from INPUTsys-Chris/master
Browse files Browse the repository at this point in the history
Updated versions to 3.44.1. Removed quadmath workaround.
  • Loading branch information
Willena authored Nov 24, 2023
2 parents 58eceb9 + 4ec3e4a commit 17409e8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,6 @@ $(SQLITE_OUT)/sqlite3.o : $(SQLITE_UNPACKED) $(SQLITE_SOURCE)/sqlite3.c $(SQLITE
@mkdir -p $(@D)
cp $(SQLITE_SOURCE)/* $(SQLITE_OUT)/

# Temporary workaround for quadmath on Windows ARM64
perl -p -e "s/#if defined\(__GNUC__\) && defined\(_WIN64\)/#if defined(__GNUC__) && defined(_WIN64) && defined(__x86_64__)/;" \
$(SQLITE_OUT)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c.tmp
cat $(SQLITE_OUT)/sqlite3.c.tmp > $(SQLITE_OUT)/sqlite3.c


# perl -p -e "s/sqlite3_api;/sqlite3_api = 0;/g" $(SQLITE_SOURCE)/sqlite3ext.h > $(SQLITE_OUT)/sqlite3ext.h
# insert a code for loading extension functions
# perl -p -e "s/^opendb_out:/ if(!db->mallocFailed && rc==SQLITE_OK){ rc = RegisterExtensionFunctions(db); }\nopendb_out:/;" $(SQLITE_SOURCE)/sqlite3.c > $(SQLITE_OUT)/sqlite3.c.tmp
Expand Down
2 changes: 1 addition & 1 deletion Makefile.common
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ Windows-x86_SQLITE_FLAGS :=
Windows-x86_64_CC := $(CROSS_PREFIX)gcc
Windows-x86_64_STRIP := $(CROSS_PREFIX)strip
Windows-x86_64_CCFLAGS := -D_JNI_IMPLEMENTATION_ -Ilib/inc_win -Os -msse4.2 -maes
Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc -lquadmath
Windows-x86_64_LINKFLAGS := -Wl,--kill-at -shared -static-libgcc
Windows-x86_64_LIBNAME := sqlitejdbc.dll
Windows-x86_64_SQLITE_FLAGS :=

Expand Down
6 changes: 3 additions & 3 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
version=3.44.0
artifactVersion=3.44.0.1
sqliteMCVersion=1.7.4
version=3.44.1
artifactVersion=3.44.1.0
sqliteMCVersion=1.8.0

0 comments on commit 17409e8

Please sign in to comment.