X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2FAndroid.mk;h=1f9922f8e685e2f8b102a23937e9c9f98f7b5cb8;hp=9922a17a16ce33f2273be70f42b13ad772e694ab;hb=c4ebc9acc10cfdcdfb88a3aa8d7a32cdd6cf8b6e;hpb=72bb1f5d2849131d094f38b9a0ce2d17ecacefe1 diff --git a/src/Android.mk b/src/Android.mk index 9922a17a..1f9922f8 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 := ../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 LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/$(SDL_PATH)/include \ @@ -41,7 +41,6 @@ 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 \ @@ -97,12 +96,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 include $(BUILD_SHARED_LIBRARY)