From 71a667effe0068ac6b68b939d88c6aead441667b Mon Sep 17 00:00:00 2001 From: mittorn Date: Tue, 16 Jun 2015 22:45:30 +0700 Subject: [PATCH] Enable XASH_SDL by default --- jni/Application.mk | 2 ++ src/in/celest/xash3d/LauncherActivity.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jni/Application.mk b/jni/Application.mk index c91cf6e0..fd0827e1 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -3,6 +3,8 @@ # See CPLUSPLUS-SUPPORT.html in the NDK documentation for more information APP_STL := stlport_static +XASH_SDL ?= 1 + ifeq ($(XASH_SDL),1) APP_PLATFORM := android-12 else diff --git a/src/in/celest/xash3d/LauncherActivity.java b/src/in/celest/xash3d/LauncherActivity.java index eb96db1d..e5827d62 100644 --- a/src/in/celest/xash3d/LauncherActivity.java +++ b/src/in/celest/xash3d/LauncherActivity.java @@ -21,8 +21,8 @@ public class LauncherActivity extends Activity { public void startXash(View view) { - //Intent intent = new Intent(this, org.libsdl.app.SDLActivity.class); - Intent intent = new Intent(this, in.celest.xash3d.XashActivity.class); + Intent intent = new Intent(this, org.libsdl.app.SDLActivity.class); + //Intent intent = new Intent(this, in.celest.xash3d.XashActivity.class); EditText cmdArgs = (EditText)findViewById(R.id.cmdArgs); String sArgv = cmdArgs.getText().toString();