added optional button to restart game (door, panel and touch variants)

[rocksndiamonds.git] / src / Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index 9922a17a16ce33f2273be70f42b13ad772e694ab..a644d93a1b7c85d7ff8b93584a5386b81c326217 100644 (file)
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -4,7 +4,7 @@
 # (c) 1995-2014 by Artsoft Entertainment
 #                  Holger Schemel
 #                  info@artsoft.org
-#                  http://www.artsoft.org/
+#                  https://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       := ../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       \
@@ -28,9 +28,11 @@ LOCAL_C_INCLUDES :=                          \
 
 DEBUG = -DDEBUG -g
 OPTIONS = $(DEBUG) -Wall                       # only for debugging purposes
-# OPTIONS = -O3 -Wall                          # distribution build
 
-# LOCAL_CFLAGS := -DTARGET_SDL2
+ifdef BUILD_DIST                               # distribution build
+OPTIONS = -O2 -Wall
+endif
+
 LOCAL_CFLAGS := -DTARGET_SDL2 $(OPTIONS)
 
 # application source code files
@@ -41,25 +43,25 @@ 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                  \
+       libgame/http.c                  \
+       libgame/base64.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                  \
@@ -83,6 +85,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 +104,13 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        editor.c                        \
        files.c                         \
        tape.c                          \
-       cartoons.c                      \
+       anim.c                          \
+       api.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)