https://github.com/libsdl-org/Maelstrom/commit/137c396bb70f3a128100816da27ea2bb8f43dae5
From 137c396bb70f3a128100816da27ea2bb8f43dae5 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Thu, 3 Oct 2013 03:43:05 -0700
Subject: [PATCH] Updated Android build with the latest Maelstrom files
---
android-project/jni/src/Android.mk | 49 ++++++++++---------
.../src/org/libsdl/app/SDLActivity.java | 6 +--
2 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/android-project/jni/src/Android.mk b/android-project/jni/src/Android.mk
index e5913224..cf7235e1 100644
--- a/android-project/jni/src/Android.mk
+++ b/android-project/jni/src/Android.mk
@@ -12,31 +12,32 @@ SDL_TTF_PATH := ../SDL_ttf
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(SDL_PATH)/include $(LOCAL_PATH)/$(SDL_IMAGE_PATH) $(LOCAL_PATH)/$(SDL_NET_PATH) $(LOCAL_PATH)/$(SDL_TTF_PATH)
# Add your application source files here...
-LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.cpp \
+LOCAL_SRC_FILES := $(SDL_PATH)/src/main/android/SDL_android_main.c \
../../../mainstub.cpp \
- ../../../game/MacDialog.cpp \
- ../../../game/MaelstromFeatures.cpp \
- ../../../game/MaelstromUI.cpp \
- ../../../game/about.cpp \
- ../../../game/continue.cpp \
- ../../../game/controls.cpp \
- ../../../game/fastrand.cpp \
- ../../../game/game.cpp \
- ../../../game/gameinfo.cpp \
- ../../../game/gameover.cpp \
- ../../../game/init.cpp \
- ../../../game/load.cpp \
- ../../../game/lobby.cpp \
- ../../../game/main.cpp \
- ../../../game/make.cpp \
- ../../../game/myerror.cpp \
- ../../../game/netplay.cpp \
- ../../../game/object.cpp \
- ../../../game/objects.cpp \
- ../../../game/player.cpp \
- ../../../game/rect.cpp \
- ../../../game/replay.cpp \
- ../../../game/scores.cpp \
+ ../../../game/MacDialog.cpp \
+ ../../../game/MaelstromUI.cpp \
+ ../../../game/ServiceManager.cpp \
+ ../../../game/about.cpp \
+ ../../../game/continue.cpp \
+ ../../../game/controls.cpp \
+ ../../../game/fastrand.cpp \
+ ../../../game/game.cpp \
+ ../../../game/gameinfo.cpp \
+ ../../../game/gameover.cpp \
+ ../../../game/init.cpp \
+ ../../../game/load.cpp \
+ ../../../game/lobby.cpp \
+ ../../../game/main.cpp \
+ ../../../game/make.cpp \
+ ../../../game/myerror.cpp \
+ ../../../game/netplay.cpp \
+ ../../../game/object.cpp \
+ ../../../game/objects.cpp \
+ ../../../game/player.cpp \
+ ../../../game/rect.cpp \
+ ../../../game/replay.cpp \
+ ../../../game/scores.cpp \
+ ../../../game/store.cpp \
../../../maclib/Mac_FontServ.cpp \
../../../maclib/Mac_Sound.cpp \
../../../physfs/archiver_dir.c \
diff --git a/android-project/src/org/libsdl/app/SDLActivity.java b/android-project/src/org/libsdl/app/SDLActivity.java
index 52e48e23..484759a7 100644
--- a/android-project/src/org/libsdl/app/SDLActivity.java
+++ b/android-project/src/org/libsdl/app/SDLActivity.java
@@ -40,10 +40,10 @@ public class SDLActivity extends Activity {
// Load the .so
static {
System.loadLibrary("SDL2");
- //System.loadLibrary("SDL2_image");
+ System.loadLibrary("SDL2_image");
//System.loadLibrary("SDL2_mixer");
- //System.loadLibrary("SDL2_net");
- //System.loadLibrary("SDL2_ttf");
+ System.loadLibrary("SDL2_net");
+ System.loadLibrary("SDL2_ttf");
System.loadLibrary("main");
}