endif
LOCAL_CFLAGS := -D_IRR_ANDROID_PLATFORM_ \
- -DHAVE_TOUCHSCREENGUI \
- -DUSE_CURL=1 \
- -DUSE_SOUND=1 \
- -DUSE_FREETYPE=1 \
- -DUSE_LEVELDB=$(HAVE_LEVELDB) \
- $(GPROF_DEF) \
- -pipe -fstrict-aliasing
+ -DHAVE_TOUCHSCREENGUI \
+ -DUSE_CURL=1 \
+ -DUSE_SOUND=1 \
+ -DUSE_FREETYPE=1 \
+ -DUSE_LEVELDB=$(HAVE_LEVELDB) \
+ $(GPROF_DEF) \
+ -pipe -fstrict-aliasing
ifndef NDEBUG
LOCAL_CFLAGS += -g -D_DEBUG -O0 -fno-omit-frame-pointer
else
-LOCAL_CFLAGS += -fexpensive-optimizations -O3
+LOCAL_CFLAGS += -O3
endif
ifdef GPROF
LOCAL_CFLAGS += -fno-stack-protector
endif
-LOCAL_C_INCLUDES := \
- jni/src jni/src/sqlite \
+LOCAL_C_INCLUDES := \
+ jni/src \
jni/src/script \
- jni/src/lua/src \
- jni/src/json \
+ jni/lib/lua/src \
+ jni/lib/jsoncpp \
jni/src/cguittfont \
deps/irrlicht/include \
deps/libiconv/include \
deps/leveldb/include \
deps/sqlite/
-LOCAL_SRC_FILES := \
- jni/src/areastore.cpp \
+LOCAL_SRC_FILES := \
jni/src/ban.cpp \
jni/src/camera.cpp \
- jni/src/cavegen.cpp \
+ jni/src/mapgen/cavegen.cpp \
jni/src/chat.cpp \
jni/src/client.cpp \
+ jni/src/clientenvironment.cpp \
jni/src/clientiface.cpp \
jni/src/clientmap.cpp \
jni/src/clientmedia.cpp \
jni/src/clientobject.cpp \
jni/src/clouds.cpp \
jni/src/collision.cpp \
- jni/src/content_abm.cpp \
jni/src/content_cao.cpp \
jni/src/content_cso.cpp \
jni/src/content_mapblock.cpp \
jni/src/content_sao.cpp \
jni/src/convert_json.cpp \
jni/src/craftdef.cpp \
- jni/src/database-dummy.cpp \
- jni/src/database-sqlite3.cpp \
- jni/src/database.cpp \
+ jni/src/database/database-dummy.cpp \
+ jni/src/database/database-files.cpp \
+ jni/src/database/database-sqlite3.cpp \
+ jni/src/database/database.cpp \
jni/src/debug.cpp \
jni/src/defaultsettings.cpp \
- jni/src/drawscene.cpp \
- jni/src/dungeongen.cpp \
+ jni/src/mapgen/dungeongen.cpp \
jni/src/emerge.cpp \
jni/src/environment.cpp \
+ jni/src/face_position_cache.cpp \
jni/src/filecache.cpp \
jni/src/filesys.cpp \
jni/src/fontengine.cpp \
jni/src/game.cpp \
jni/src/genericobject.cpp \
jni/src/gettext.cpp \
- jni/src/guiChatConsole.cpp \
- jni/src/guiEngine.cpp \
- jni/src/guiFileSelectMenu.cpp \
- jni/src/guiFormSpecMenu.cpp \
- jni/src/guiKeyChangeMenu.cpp \
- jni/src/guiPasswordChange.cpp \
- jni/src/guiTable.cpp \
+ jni/src/gui/guiChatConsole.cpp \
+ jni/src/gui/guiEditBoxWithScrollbar.cpp \
+ jni/src/gui/guiEngine.cpp \
+ jni/src/gui/guiPathSelectMenu.cpp \
+ jni/src/gui/guiFormSpecMenu.cpp \
+ jni/src/gui/guiKeyChangeMenu.cpp \
+ jni/src/gui/guiPasswordChange.cpp \
+ jni/src/gui/guiTable.cpp \
jni/src/guiscalingfilter.cpp \
- jni/src/guiVolumeChange.cpp \
+ jni/src/gui/guiVolumeChange.cpp \
jni/src/httpfetch.cpp \
jni/src/hud.cpp \
jni/src/imagefilters.cpp \
- jni/src/intlGUIEditBox.cpp \
+ jni/src/gui/intlGUIEditBox.cpp \
jni/src/inventory.cpp \
jni/src/inventorymanager.cpp \
jni/src/itemdef.cpp \
+ jni/src/itemstackmetadata.cpp \
jni/src/keycode.cpp \
jni/src/light.cpp \
jni/src/localplayer.cpp \
jni/src/log.cpp \
jni/src/main.cpp \
jni/src/map.cpp \
+ jni/src/map_settings_manager.cpp \
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/mapgen.cpp \
+ jni/src/mapgen/mapgen_carpathian.cpp \
+ jni/src/mapgen/mapgen_flat.cpp \
+ jni/src/mapgen/mapgen_fractal.cpp \
+ jni/src/mapgen/mapgen_singlenode.cpp \
+ jni/src/mapgen/mapgen_v5.cpp \
+ jni/src/mapgen/mapgen_v6.cpp \
+ jni/src/mapgen/mapgen_v7.cpp \
+ jni/src/mapgen/mapgen_valleys.cpp \
jni/src/mapnode.cpp \
jni/src/mapsector.cpp \
jni/src/mesh.cpp \
- jni/src/mg_biome.cpp \
- jni/src/mg_decoration.cpp \
- jni/src/mg_ore.cpp \
- jni/src/mg_schematic.cpp \
+ jni/src/mesh_generator_thread.cpp \
+ jni/src/metadata.cpp \
+ jni/src/mapgen/mg_biome.cpp \
+ jni/src/mapgen/mg_decoration.cpp \
+ jni/src/mapgen/mg_ore.cpp \
+ jni/src/mapgen/mg_schematic.cpp \
jni/src/minimap.cpp \
jni/src/mods.cpp \
jni/src/nameidmapping.cpp \
jni/src/porting.cpp \
jni/src/profiler.cpp \
jni/src/quicktune.cpp \
+ jni/src/raycast.cpp \
+ jni/src/reflowscan.cpp \
+ jni/src/remoteplayer.cpp \
jni/src/rollback.cpp \
jni/src/rollback_interface.cpp \
jni/src/serialization.cpp \
jni/src/server.cpp \
+ jni/src/serverenvironment.cpp \
jni/src/serverlist.cpp \
jni/src/serverobject.cpp \
jni/src/shader.cpp \
jni/src/sound_openal.cpp \
jni/src/staticobject.cpp \
jni/src/subgame.cpp \
+ jni/src/tileanimation.cpp \
jni/src/tool.cpp \
- jni/src/treegen.cpp \
+ jni/src/mapgen/treegen.cpp \
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 \
+ jni/src/util/enriched_string.cpp \
jni/src/util/numeric.cpp \
jni/src/util/pointedthing.cpp \
jni/src/util/serialize.cpp \
jni/src/unittest/test_connection.cpp \
jni/src/unittest/test_filepath.cpp \
jni/src/unittest/test_inventory.cpp \
+ jni/src/unittest/test_map_settings_manager.cpp \
jni/src/unittest/test_mapnode.cpp \
jni/src/unittest/test_nodedef.cpp \
jni/src/unittest/test_noderesolver.cpp \
jni/src/settings.cpp \
jni/src/wieldmesh.cpp \
jni/src/client/clientlauncher.cpp \
- jni/src/client/tile.cpp
+ jni/src/client/hud.cpp \
+ jni/src/client/inputhandler.cpp \
+ jni/src/client/renderingengine.cpp \
+ jni/src/client/tile.cpp \
+ jni/src/client/joystick_controller.cpp \
+ jni/src/irrlicht_changes/static_text.cpp
# intentionally kept out (we already build openssl itself): jni/src/util/sha256.c
# Network
-LOCAL_SRC_FILES += \
+LOCAL_SRC_FILES += \
jni/src/network/connection.cpp \
jni/src/network/networkpacket.cpp \
jni/src/network/clientopcodes.cpp \
jni/src/network/serverpackethandler.cpp \
# lua api
-LOCAL_SRC_FILES += \
+LOCAL_SRC_FILES += \
jni/src/script/common/c_content.cpp \
jni/src/script/common/c_converter.cpp \
jni/src/script/common/c_internal.cpp \
jni/src/script/common/c_types.cpp \
jni/src/script/cpp_api/s_async.cpp \
jni/src/script/cpp_api/s_base.cpp \
+ jni/src/script/cpp_api/s_client.cpp \
jni/src/script/cpp_api/s_entity.cpp \
jni/src/script/cpp_api/s_env.cpp \
jni/src/script/cpp_api/s_inventory.cpp \
jni/src/script/cpp_api/s_server.cpp \
jni/src/script/lua_api/l_areastore.cpp \
jni/src/script/lua_api/l_base.cpp \
+ jni/src/script/lua_api/l_camera.cpp \
+ jni/src/script/lua_api/l_client.cpp \
jni/src/script/lua_api/l_craft.cpp \
jni/src/script/lua_api/l_env.cpp \
jni/src/script/lua_api/l_inventory.cpp \
jni/src/script/lua_api/l_item.cpp \
+ jni/src/script/lua_api/l_itemstackmeta.cpp\
+ jni/src/script/lua_api/l_localplayer.cpp \
jni/src/script/lua_api/l_mainmenu.cpp \
jni/src/script/lua_api/l_mapgen.cpp \
+ jni/src/script/lua_api/l_metadata.cpp \
+ jni/src/script/lua_api/l_minimap.cpp \
jni/src/script/lua_api/l_nodemeta.cpp \
jni/src/script/lua_api/l_nodetimer.cpp \
jni/src/script/lua_api/l_noise.cpp \
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_sound.cpp \
+ jni/src/script/lua_api/l_http.cpp \
+ jni/src/script/lua_api/l_storage.cpp \
jni/src/script/lua_api/l_util.cpp \
jni/src/script/lua_api/l_vmanip.cpp \
- jni/src/script/scripting_game.cpp \
+ jni/src/script/scripting_client.cpp \
+ jni/src/script/scripting_server.cpp \
jni/src/script/scripting_mainmenu.cpp
#freetype2 support
-LOCAL_SRC_FILES += \
- jni/src/cguittfont/xCGUITTFont.cpp
-
-# lua
-LOCAL_SRC_FILES += \
- jni/src/lua/src/lapi.c \
- jni/src/lua/src/lauxlib.c \
- jni/src/lua/src/lbaselib.c \
- jni/src/lua/src/lcode.c \
- jni/src/lua/src/ldblib.c \
- jni/src/lua/src/ldebug.c \
- jni/src/lua/src/ldo.c \
- jni/src/lua/src/ldump.c \
- jni/src/lua/src/lfunc.c \
- jni/src/lua/src/lgc.c \
- jni/src/lua/src/linit.c \
- jni/src/lua/src/liolib.c \
- jni/src/lua/src/llex.c \
- jni/src/lua/src/lmathlib.c \
- jni/src/lua/src/lmem.c \
- jni/src/lua/src/loadlib.c \
- jni/src/lua/src/lobject.c \
- jni/src/lua/src/lopcodes.c \
- jni/src/lua/src/loslib.c \
- jni/src/lua/src/lparser.c \
- jni/src/lua/src/lstate.c \
- jni/src/lua/src/lstring.c \
- jni/src/lua/src/lstrlib.c \
- jni/src/lua/src/ltable.c \
- jni/src/lua/src/ltablib.c \
- jni/src/lua/src/ltm.c \
- jni/src/lua/src/lundump.c \
- jni/src/lua/src/lvm.c \
- jni/src/lua/src/lzio.c \
- jni/src/lua/src/print.c
+LOCAL_SRC_FILES += jni/src/cguittfont/xCGUITTFont.cpp
+
+# Lua
+LOCAL_SRC_FILES += \
+ jni/lib/lua/src/lapi.c \
+ jni/lib/lua/src/lauxlib.c \
+ jni/lib/lua/src/lbaselib.c \
+ jni/lib/lua/src/lcode.c \
+ jni/lib/lua/src/ldblib.c \
+ jni/lib/lua/src/ldebug.c \
+ jni/lib/lua/src/ldo.c \
+ jni/lib/lua/src/ldump.c \
+ jni/lib/lua/src/lfunc.c \
+ jni/lib/lua/src/lgc.c \
+ jni/lib/lua/src/linit.c \
+ jni/lib/lua/src/liolib.c \
+ jni/lib/lua/src/llex.c \
+ jni/lib/lua/src/lmathlib.c \
+ jni/lib/lua/src/lmem.c \
+ jni/lib/lua/src/loadlib.c \
+ jni/lib/lua/src/lobject.c \
+ jni/lib/lua/src/lopcodes.c \
+ jni/lib/lua/src/loslib.c \
+ jni/lib/lua/src/lparser.c \
+ jni/lib/lua/src/lstate.c \
+ jni/lib/lua/src/lstring.c \
+ jni/lib/lua/src/lstrlib.c \
+ jni/lib/lua/src/ltable.c \
+ jni/lib/lua/src/ltablib.c \
+ jni/lib/lua/src/ltm.c \
+ jni/lib/lua/src/lundump.c \
+ jni/lib/lua/src/lvm.c \
+ jni/lib/lua/src/lzio.c \
+ jni/lib/lua/src/print.c
# SQLite3
LOCAL_SRC_FILES += deps/sqlite/sqlite3.c
jni/src/threading/thread.cpp
# JSONCPP
-LOCAL_SRC_FILES += jni/src/json/jsoncpp.cpp
+LOCAL_SRC_FILES += jni/lib/jsoncpp/jsoncpp.cpp
LOCAL_SHARED_LIBRARIES := iconv openal ogg vorbis gmp
LOCAL_STATIC_LIBRARIES := Irrlicht freetype curl ssl crypto android_native_app_glue $(PROFILER_LIBS)
projects / oweals / minetest.git / blobdiff