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 89a7e34fd53f41cafefcf75c826f2fcfa6265545..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       := ../build-projects/android/jni/SDL2
-SDL_IMAGE_PATH := ../build-projects/android/jni/SDL2_image
-SDL_MIXER_PATH := ../build-projects/android/jni/SDL2_mixer
-SDL_NET_PATH   := ../build-projects/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       \
@@ -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
@@ -44,6 +46,8 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.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                   \
@@ -55,7 +59,7 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        game_em/convert.c               \
        game_em/graphics.c              \
        game_em/init.c                  \
-       game_em/input.c                 \
+       game_em/game.c                  \
        game_em/logic.c                 \
        game_em/reademc.c               \
        game_sp/init.c                  \
@@ -101,10 +105,11 @@ LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
        files.c                         \
        tape.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 -lGLESv2 -llog -lz