fixed short reactivation of overlay buttons while closing door after game

[rocksndiamonds.git] / src / Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 46b42df6b1e2fef3dac2526db806d7c7c8267d21..a5b714e0202da264fc037711924fe49e2ca6caeb 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -2,9 +2,9 @@
 # Rocks'n'Diamonds - McDuffin Strikes Back!
 # -----------------------------------------------------------------------------
 # (c) 1995-2014 by Artsoft Entertainment
-#                  Holger Schemel
-#                  info@artsoft.org
-#                  http://www.artsoft.org/
+#                  Holger Schemel
+#                  info@artsoft.org
+#                  http://www.artsoft.org/
 # -----------------------------------------------------------------------------
 # src/Android.mk
 # =============================================================================
@@ -15,10 +15,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := main
 
-SDL_PATH       := ../Special/Android/jni/SDL2-2.0.1
-SDL_IMAGE_PATH := ../Special/Android/jni/SDL2_image-2.0.0
-SDL_MIXER_PATH := ../Special/Android/jni/SDL2_mixer-2.0.0
-SDL_NET_PATH   := ../Special/Android/jni/SDL2_net-2.0.0
+SDL_PATH       := ../Special/Android/jni/SDL2
+SDL_IMAGE_PATH := ../Special/Android/jni/SDL2_image
+SDL_MIXER_PATH := ../Special/Android/jni/SDL2_mixer
+SDL_NET_PATH   := ../Special/Android/jni/SDL2_net
 
 LOCAL_C_INCLUDES :=                            \
        $(LOCAL_PATH)/$(SDL_PATH)/include       \
@@ -41,7 +41,6 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        libgame/sound.c                 \
        libgame/joystick.c              \
        libgame/snapshot.c              \
-       libgame/toons.c                 \
        libgame/image.c                 \
        libgame/random.c                \
        libgame/hash.c                  \
@@ -83,6 +82,11 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        game_sp/SnikSnaks.c             \
        game_sp/Sound.c                 \
        game_sp/Zonk.c                  \
+       game_mm/mm_init.c               \
+       game_mm/mm_main.c               \
+       game_mm/mm_game.c               \
+       game_mm/mm_files.c              \
+       game_mm/mm_tools.c              \
        main.c                          \
        conf_gfx.c                      \
        conf_snd.c                      \
@@ -97,12 +101,12 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        editor.c                        \
        files.c                         \
        tape.c                          \
-       cartoons.c                      \
+       anim.c                          \
        network.c                       \
        netserv.c
 
 LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_mixer SDL2_net smpeg2
 
-LOCAL_LDLIBS := -lGLESv1_CM -llog
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
 
 include $(BUILD_SHARED_LIBRARY)