Merge pull request #17 from bricelam/math2

Re-enable math functions
ericsink · Aug 9, 2023 · be32caa · be32caa
2 parents 7e04899 + 393d54e
commit be32caa
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/bld/android/jni/Android.mk b/bld/android/jni/Android.mk
@@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libe_sqlite3
 LOCAL_MODULE_FILENAME    := libe_sqlite3
-LOCAL_CFLAGS := -O -DNDEBUG -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_OS_UNIX
+LOCAL_CFLAGS := -O -DNDEBUG -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_RTREE -DSQLITE_OS_UNIX
 LOCAL_SRC_FILES = ../../../sqlite3/sqlite3.c
 
 include $(BUILD_SHARED_LIBRARY)

diff --git a/bld/android/project.properties b/bld/android/project.properties
@@ -11,4 +11,4 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-14
+target=android-21
diff --git a/bld/cb.cs b/bld/cb.cs
@@ -280,7 +280,7 @@ IList<string> libs
 	var dest_project_properties = Path.Combine(dest_dir, "project.properties");
 	using (TextWriter tw = new StreamWriter(dest_project_properties))
 	{
-		tw.Write("target=android-14\n");
+		tw.Write("target=android-21\n");
 	}
     }
 
@@ -1196,7 +1196,7 @@ static void add_basic_sqlite3_defines(Dictionary<string,string> defines)
         defines["SQLITE_ENABLE_FTS4"] = null;
         defines["SQLITE_ENABLE_FTS5"] = null;
         defines["SQLITE_ENABLE_JSON1"] = null;
-        //defines["SQLITE_ENABLE_MATH_FUNCTIONS"] = null;
+        defines["SQLITE_ENABLE_MATH_FUNCTIONS"] = null;
         defines["SQLITE_ENABLE_RTREE"] = null;
         defines["SQLITE_ENABLE_SNAPSHOT"] = null;
         defines["SQLITE_DEFAULT_FOREIGN_KEYS"] = "1";