sound_openal.cpp: remove unused header

[dragonfireclient.git] / build / android / Makefile

diff --git a/build/android/Makefile b/build/android/Makefile
index 0a55c324c739d4402044361aaa8680a4efb9e076..66d12ac8b5c20a32f3c0812e15af50c344135b9d 100644 (file)
--- a/build/android/Makefile
+++ b/build/android/Makefile
@@ -14,6 +14,7 @@ PATHCFGFILE = path.cfg
 ROOT = $(shell pwd)
 
 GAMES_TO_COPY = minetest_game
+MODS_TO_COPY =
 
 
 VERSION_MAJOR := $(shell cat $(ROOT)/../../CMakeLists.txt | \
@@ -88,7 +89,7 @@ LEVELDB_DIR = $(ROOT)/deps/leveldb/
 LEVELDB_LIB = $(LEVELDB_DIR)libleveldb.a
 LEVELDB_TIMESTAMP = $(LEVELDB_DIR)/timestamp
 LEVELDB_TIMESTAMP_INT = $(ROOT)/deps/leveldb_timestamp
-LEVELDB_URL_GIT = https://code.google.com/p/leveldb/
+LEVELDB_URL_GIT = https://github.com/google/leveldb
 
 OPENAL_DIR = $(ROOT)/deps/openal-soft/
 OPENAL_LIB = $(OPENAL_DIR)libs/$(TARGET_ABI)/libopenal.so
@@ -753,11 +754,13 @@ assets : $(ASSETS_TIMESTAMP)
        cp -r ${ROOT}/../../doc ${ROOT}/assets/Minetest;                           \
        cp -r ${ROOT}/../../fonts ${ROOT}/assets/Minetest;                         \
        mkdir ${ROOT}/assets/Minetest/games;                                       \
-       for game in ${GAMES_TO_COPY};                                              \
-       do                                                                         \
+       for game in ${GAMES_TO_COPY}; do                                           \
            cp -r ${ROOT}/../../games/$$game ${ROOT}/assets/Minetest/games/;       \
        done;                                                                      \
-       cp -r ${ROOT}/../../mods ${ROOT}/assets/Minetest;                          \
+       mkdir ${ROOT}/assets/Minetest/mods;                                        \
+       for mod in ${MODS_TO_COPY}; do                                             \
+           cp -r ${ROOT}/../../mods/$$mod ${ROOT}/assets/Minetest/mods/;          \
+       done;                                                                      \
        cp -r ${ROOT}/../../po ${ROOT}/assets/Minetest;                            \
        cp -r ${ROOT}/../../textures ${ROOT}/assets/Minetest;                      \
        mkdir -p ${ROOT}/assets/Minetest/media;                                    \