changed build system for Android from Ant to Gradle

[rocksndiamonds.git] / src / Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index d2bb301f578814cbbd0b2fb52c956776865ed07f..092204c6b4299d10d7f67b28c1f33c8211a62915 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -15,10 +15,10 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := main
 
-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
+SDL_PATH       := ../build-projects/android/app/jni/SDL2
+SDL_IMAGE_PATH := ../build-projects/android/app/jni/SDL2_image
+SDL_MIXER_PATH := ../build-projects/android/app/jni/SDL2_mixer
+SDL_NET_PATH   := ../build-projects/android/app/jni/SDL2_net
 
 LOCAL_C_INCLUDES :=                            \
        $(LOCAL_PATH)/$(SDL_PATH)/include       \
@@ -47,18 +47,17 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        libgame/setup.c                 \
        libgame/misc.c                  \
        libgame/sdl.c                   \
+       libgame/zip/ioapi.c             \
+       libgame/zip/iowin32.c           \
+       libgame/zip/unzip.c             \
+       libgame/zip/miniunz.c           \
        game_em/cave.c                  \
        game_em/convert.c               \
        game_em/graphics.c              \
        game_em/init.c                  \
-       game_em/input.c                 \
-       game_em/main.c                  \
-       game_em/sound.c                 \
-       game_em/synchro_1.c             \
-       game_em/synchro_2.c             \
-       game_em/synchro_3.c             \
-       game_em/tab_generate.c          \
-       game_em/ulaw_generate.c         \
+       game_em/game.c                  \
+       game_em/logic.c                 \
+       game_em/reademc.c               \
        game_sp/init.c                  \
        game_sp/file.c                  \
        game_sp/main.c                  \
@@ -82,6 +81,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                      \
@@ -100,8 +104,8 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        network.c                       \
        netserv.c
 
-LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_mixer SDL2_net smpeg2
+LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_mixer SDL2_net
 
-LOCAL_LDLIBS := -lGLESv1_CM -llog
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lz
 
 include $(BUILD_SHARED_LIBRARY)