Move AreaStore to util

[minetest.git] / build / android / jni / Android.mk

diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index cf7094ca8580388f2318f5aff3e75ddaa9985ab4..92738e6cc616e15e4d050b52d397897f7426d52e 100644 (file)
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -80,7 +80,7 @@ LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_      \
 ifndef NDEBUG
 LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
 else
-LOCAL_CFLAGS += -fexpensive-optimizations -O3
+LOCAL_CFLAGS += -O3
 endif
 
 ifdef GPROF
@@ -112,7 +112,6 @@ LOCAL_C_INCLUDES :=                               \
                deps/sqlite/
 
 LOCAL_SRC_FILES :=                                \
-               jni/src/areastore.cpp                     \
                jni/src/ban.cpp                           \
                jni/src/camera.cpp                        \
                jni/src/cavegen.cpp                       \
@@ -173,10 +172,13 @@ LOCAL_SRC_FILES :=                                \
                jni/src/mapblock.cpp                      \
                jni/src/mapblock_mesh.cpp                 \
                jni/src/mapgen.cpp                        \
+               jni/src/mapgen_flat.cpp                   \
+               jni/src/mapgen_fractal.cpp                \
                jni/src/mapgen_singlenode.cpp             \
                jni/src/mapgen_v5.cpp                     \
                jni/src/mapgen_v6.cpp                     \
                jni/src/mapgen_v7.cpp                     \
+               jni/src/mapgen_valleys.cpp                \
                jni/src/mapnode.cpp                       \
                jni/src/mapsector.cpp                     \
                jni/src/mesh.cpp                          \
@@ -218,6 +220,7 @@ LOCAL_SRC_FILES :=                                \
                jni/src/version.cpp                       \
                jni/src/voxel.cpp                         \
                jni/src/voxelalgorithms.cpp               \
+               jni/src/util/areastore.cpp                \
                jni/src/util/auth.cpp                     \
                jni/src/util/base64.cpp                   \
                jni/src/util/directiontables.cpp          \
@@ -300,6 +303,7 @@ LOCAL_SRC_FILES +=                                \
                jni/src/script/lua_api/l_rollback.cpp     \
                jni/src/script/lua_api/l_server.cpp       \
                jni/src/script/lua_api/l_settings.cpp     \
+               jni/src/script/lua_api/l_http.cpp         \
                jni/src/script/lua_api/l_util.cpp         \
                jni/src/script/lua_api/l_vmanip.cpp       \
                jni/src/script/scripting_game.cpp         \
@@ -347,9 +351,10 @@ LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
 
 # Threading
 LOCAL_SRC_FILES += \
-               jni/src/threading/Mutex.cpp \
-               jni/src/threading/Semaphore.cpp \
-               jni/src/threading/Thread.cpp
+               jni/src/threading/event.cpp \
+               jni/src/threading/mutex.cpp \
+               jni/src/threading/semaphore.cpp \
+               jni/src/threading/thread.cpp
 
 # JSONCPP
 LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp