aboutsummaryrefslogtreecommitdiff
path: root/build/android/jni
diff options
context:
space:
mode:
authorLoic Blot <loic.blot@unix-experience.fr>2015-03-05 11:52:57 +0100
committerLoic Blot <loic.blot@unix-experience.fr>2015-03-05 11:59:40 +0100
commit0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697 (patch)
tree2599bf47d98c80bf08d7253bc68ffe7dcff1ceea /build/android/jni
parentaa474e4501f460ba853dc70ff4d97cbd061e6704 (diff)
downloadminetest-0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697.tar.gz
minetest-0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697.tar.bz2
minetest-0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697.zip
Replace std::list to std::vector into tile.cpp (m_texture_trash) and move tile.hpp to src/client/
Diffstat (limited to 'build/android/jni')
-rw-r--r--build/android/jni/Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/build/android/jni/Android.mk b/build/android/jni/Android.mk
index c3982c370..a35084433 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -196,7 +196,6 @@ LOCAL_SRC_FILES := \
jni/src/staticobject.cpp \
jni/src/subgame.cpp \
jni/src/test.cpp \
- jni/src/tile.cpp \
jni/src/tool.cpp \
jni/src/treegen.cpp \
jni/src/version.cpp \
@@ -214,7 +213,8 @@ LOCAL_SRC_FILES := \
jni/src/database-leveldb.cpp \
jni/src/settings.cpp \
jni/src/wieldmesh.cpp \
- jni/src/client/clientlauncher.cpp
+ jni/src/client/clientlauncher.cpp \
+ jni/src/client/tile.cpp
# Network
LOCAL_SRC_FILES += \