diff options
| -rw-r--r-- | build/android/jni/Android.mk | 148 |
1 files changed, 76 insertions, 72 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk index 364278f68..0f5c885ac 100644 --- a/build/android/jni/Android.mk +++ b/build/android/jni/Android.mk @@ -113,56 +113,84 @@ LOCAL_C_INCLUDES := \ LOCAL_SRC_FILES := \ jni/src/ban.cpp \ - jni/src/client/camera.cpp \ - jni/src/mapgen/cavegen.cpp \ jni/src/chat.cpp \ + jni/src/client/activeobjectmgr.cpp \ + jni/src/client/camera.cpp \ jni/src/client/client.cpp \ jni/src/client/clientenvironment.cpp \ - jni/src/clientiface.cpp \ + jni/src/client/clientlauncher.cpp \ jni/src/client/clientmap.cpp \ jni/src/client/clientmedia.cpp \ jni/src/client/clientobject.cpp \ jni/src/client/clouds.cpp \ - jni/src/collision.cpp \ jni/src/client/content_cao.cpp \ jni/src/client/content_cso.cpp \ jni/src/client/content_mapblock.cpp \ - jni/src/content_mapnode.cpp \ - jni/src/content_nodemeta.cpp \ - jni/src/content_sao.cpp \ + jni/src/client/filecache.cpp \ + jni/src/client/fontengine.cpp \ + jni/src/client/game.cpp \ + jni/src/client/gameui.cpp \ + jni/src/client/guiscalingfilter.cpp \ + jni/src/client/hud.cpp \ + jni/src/clientiface.cpp \ + jni/src/client/imagefilters.cpp \ + jni/src/client/inputhandler.cpp \ + jni/src/client/joystick_controller.cpp \ + jni/src/client/keycode.cpp \ + jni/src/client/localplayer.cpp \ + jni/src/client/mapblock_mesh.cpp \ + jni/src/client/mesh.cpp \ + jni/src/client/meshgen/collector.cpp \ + jni/src/client/mesh_generator_thread.cpp \ + jni/src/client/minimap.cpp \ + jni/src/client/particles.cpp \ + jni/src/client/render/anaglyph.cpp \ + jni/src/client/render/core.cpp \ + jni/src/client/render/factory.cpp \ + jni/src/client/renderingengine.cpp \ + jni/src/client/render/interlaced.cpp \ + jni/src/client/render/pageflip.cpp \ + jni/src/client/render/plain.cpp \ + jni/src/client/render/sidebyside.cpp \ + jni/src/client/render/stereo.cpp \ + jni/src/client/shader.cpp \ + jni/src/client/sky.cpp \ + jni/src/client/sound.cpp \ + jni/src/client/sound_openal.cpp \ + jni/src/client/tile.cpp \ + jni/src/client/wieldmesh.cpp \ + jni/src/collision.cpp \ jni/src/content/content.cpp \ + jni/src/content_mapnode.cpp \ jni/src/content/mods.cpp \ + jni/src/content_nodemeta.cpp \ jni/src/content/packages.cpp \ + jni/src/content_sao.cpp \ jni/src/content/subgames.cpp \ jni/src/convert_json.cpp \ jni/src/craftdef.cpp \ + jni/src/database/database.cpp \ jni/src/database/database-dummy.cpp \ jni/src/database/database-files.cpp \ jni/src/database/database-leveldb.cpp \ jni/src/database/database-sqlite3.cpp \ - jni/src/database/database.cpp \ jni/src/debug.cpp \ jni/src/defaultsettings.cpp \ - jni/src/mapgen/dungeongen.cpp \ jni/src/emerge.cpp \ jni/src/environment.cpp \ jni/src/face_position_cache.cpp \ - jni/src/client/filecache.cpp \ jni/src/filesys.cpp \ - jni/src/client/fontengine.cpp \ - jni/src/client/game.cpp \ jni/src/genericobject.cpp \ jni/src/gettext.cpp \ jni/src/gui/guiChatConsole.cpp \ jni/src/gui/guiConfirmRegistration.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/guiPathSelectMenu.cpp \ jni/src/gui/guiTable.cpp \ - jni/src/client/guiscalingfilter.cpp \ jni/src/gui/guiVolumeChange.cpp \ jni/src/gui/intlGUIEditBox.cpp \ jni/src/gui/modalMenu.cpp \ @@ -170,22 +198,21 @@ LOCAL_SRC_FILES := \ jni/src/gui/touchscreengui.cpp \ jni/src/httpfetch.cpp \ jni/src/hud.cpp \ - jni/src/client/imagefilters.cpp \ jni/src/inventory.cpp \ jni/src/inventorymanager.cpp \ + jni/src/irrlicht_changes/CGUITTFont.cpp \ + jni/src/irrlicht_changes/static_text.cpp \ jni/src/itemdef.cpp \ jni/src/itemstackmetadata.cpp \ - jni/src/client/keycode.cpp \ jni/src/light.cpp \ - jni/src/client/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/client/mapblock_mesh.cpp \ - jni/src/mapgen/mapgen.cpp \ + jni/src/map.cpp \ + jni/src/mapgen/cavegen.cpp \ + jni/src/mapgen/dungeongen.cpp \ jni/src/mapgen/mapgen_carpathian.cpp \ + jni/src/mapgen/mapgen.cpp \ jni/src/mapgen/mapgen_flat.cpp \ jni/src/mapgen/mapgen_fractal.cpp \ jni/src/mapgen/mapgen_singlenode.cpp \ @@ -193,16 +220,15 @@ LOCAL_SRC_FILES := \ 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/client/mesh.cpp \ - jni/src/client/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/client/minimap.cpp \ + jni/src/mapgen/treegen.cpp \ + jni/src/mapnode.cpp \ + jni/src/mapsector.cpp \ + jni/src/map_settings_manager.cpp \ + jni/src/metadata.cpp \ jni/src/modchannels.cpp \ jni/src/nameidmapping.cpp \ jni/src/nodedef.cpp \ @@ -211,7 +237,6 @@ LOCAL_SRC_FILES := \ jni/src/noise.cpp \ jni/src/objdef.cpp \ jni/src/object_properties.cpp \ - jni/src/client/particles.cpp \ jni/src/pathfinder.cpp \ jni/src/player.cpp \ jni/src/porting_android.cpp \ @@ -224,43 +249,27 @@ LOCAL_SRC_FILES := \ jni/src/rollback.cpp \ jni/src/rollback_interface.cpp \ jni/src/serialization.cpp \ - jni/src/server/mods.cpp \ + jni/src/server/activeobjectmgr.cpp \ jni/src/server.cpp \ jni/src/serverenvironment.cpp \ jni/src/serverlist.cpp \ + jni/src/server/mods.cpp \ jni/src/serverobject.cpp \ - jni/src/client/shader.cpp \ - jni/src/client/sky.cpp \ + jni/src/settings.cpp \ jni/src/staticobject.cpp \ jni/src/tileanimation.cpp \ - jni/src/translation.cpp \ jni/src/tool.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/util/sha1.cpp \ - jni/src/util/string.cpp \ - jni/src/util/srp.cpp \ - jni/src/util/timetaker.cpp \ - jni/src/unittest/test.cpp \ + jni/src/translation.cpp \ jni/src/unittest/test_authdatabase.cpp \ jni/src/unittest/test_collision.cpp \ jni/src/unittest/test_compression.cpp \ jni/src/unittest/test_connection.cpp \ + jni/src/unittest/test.cpp \ jni/src/unittest/test_filepath.cpp \ jni/src/unittest/test_gameui.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_map_settings_manager.cpp \ jni/src/unittest/test_nodedef.cpp \ jni/src/unittest/test_noderesolver.cpp \ jni/src/unittest/test_noise.cpp \ @@ -274,28 +283,23 @@ LOCAL_SRC_FILES := \ jni/src/unittest/test_utilities.cpp \ jni/src/unittest/test_voxelalgorithms.cpp \ jni/src/unittest/test_voxelmanipulator.cpp \ - jni/src/settings.cpp \ - jni/src/client/wieldmesh.cpp \ - jni/src/client/meshgen/collector.cpp \ - jni/src/client/clientlauncher.cpp \ - jni/src/client/gameui.cpp \ - jni/src/client/hud.cpp \ - jni/src/client/inputhandler.cpp \ - jni/src/client/renderingengine.cpp \ - jni/src/client/sound.cpp \ - jni/src/client/sound_openal.cpp \ - jni/src/client/tile.cpp \ - jni/src/client/joystick_controller.cpp \ - jni/src/client/render/factory.cpp \ - jni/src/client/render/pageflip.cpp \ - jni/src/client/render/sidebyside.cpp \ - jni/src/client/render/plain.cpp \ - jni/src/client/render/anaglyph.cpp \ - jni/src/client/render/interlaced.cpp \ - jni/src/client/render/core.cpp \ - jni/src/client/render/stereo.cpp \ - jni/src/irrlicht_changes/static_text.cpp \ - jni/src/irrlicht_changes/CGUITTFont.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/ieee_float.cpp \ + jni/src/util/numeric.cpp \ + jni/src/util/pointedthing.cpp \ + jni/src/util/serialize.cpp \ + jni/src/util/sha1.cpp \ + jni/src/util/srp.cpp \ + jni/src/util/string.cpp \ + jni/src/util/timetaker.cpp \ + jni/src/version.cpp \ + jni/src/voxelalgorithms.cpp \ + jni/src/voxel.cpp + # intentionally kept out (we already build openssl itself): jni/src/util/sha256.c |