X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FAndroid.mk;h=82c0af3fdb9321d70d5accac3693be8196d0187e;hp=9922a17a16ce33f2273be70f42b13ad772e694ab;hb=feeeabcbf6696f27ddd68ad56d19db1660a6c4fe;hpb=72bb1f5d2849131d094f38b9a0ce2d17ecacefe1

diff --git a/src/Android.mk b/src/Android.mk
index 9922a17a..82c0af3f 100644
--- a/src/Android.mk
+++ b/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/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
 
 LOCAL_C_INCLUDES :=				\
 	$(LOCAL_PATH)/$(SDL_PATH)/include	\
@@ -41,13 +41,16 @@ 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/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		\
@@ -83,6 +86,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 +105,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 -lz
 
 include $(BUILD_SHARED_LIBRARY)