X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FAndroid.mk;h=a644d93a1b7c85d7ff8b93584a5386b81c326217;hp=1f9922f8e685e2f8b102a23937e9c9f98f7b5cb8;hb=HEAD;hpb=c4ebc9acc10cfdcdfb88a3aa8d7a32cdd6cf8b6e

diff --git a/src/Android.mk b/src/Android.mk
index 1f9922f8..a644d93a 100644
--- 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
-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	\
@@ -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,21 +46,22 @@ 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			\
+	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 +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,11 +105,12 @@ 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
+LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog -lz
 
 include $(BUILD_SHARED_LIBRARY)