aboutsummaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2018-03-24 15:45:25 +0100
committerGitHub <noreply@github.com>2018-03-24 15:45:25 +0100
commit4fd97158762b4cdd4c73a6e29960e371d9de56e7 (patch)
treec768a82d972f2d7d80d20c0eccab0494b24d3538 /build
parentbcd22fc34cf70c3fe246f500633aa42e388fabc4 (diff)
downloadminetest-4fd97158762b4cdd4c73a6e29960e371d9de56e7.tar.gz
minetest-4fd97158762b4cdd4c73a6e29960e371d9de56e7.tar.bz2
minetest-4fd97158762b4cdd4c73a6e29960e371d9de56e7.zip
Cleanup sound manager class (#7158)
* Cleanup sound manager client * Use some const refs * Use auto on iterators * Drop unused parameters * Move sound_openal.* to client folder * Move sound.cpp + OnDemandSoundFetcher to client/ folder + reorganize includes properly
Diffstat (limited to 'build')
-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 4f2e788a8..1fa8fb7b0 100644
--- a/build/android/jni/Android.mk
+++ b/build/android/jni/Android.mk
@@ -227,8 +227,6 @@ LOCAL_SRC_FILES := \
jni/src/serverobject.cpp \
jni/src/shader.cpp \
jni/src/sky.cpp \
- jni/src/sound.cpp \
- jni/src/sound_openal.cpp \
jni/src/staticobject.cpp \
jni/src/subgame.cpp \
jni/src/tileanimation.cpp \
@@ -280,6 +278,8 @@ LOCAL_SRC_FILES := \
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 \