vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix and rework launch

Browse source
This commit is contained in:
mittorn 2016-05-06 14:58:09 +00:00
parent 126433c42c
commit aeee1419a2
7 changed files with 25 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
AndroidManifest.xml
View file

@ -52,7 +52,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<!--
<activity android:name="org.libsdl.app.SDLActivity"
android:screenOrientation="sensorLandscape"
android:configChanges="orientation|screenSize"
@ -63,15 +63,13 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
-->
<activity android:name="in.celest.xash3d.XashActivity"
android:screenOrientation="landscape"
android:label="@string/app_name">
<intent-filter>
<action android:name="in.celest.xash3d.XashActivity"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="in.celest.xash3d.START" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name="in.celest.xash3d.FPicker"></activity>

2
build-test.sh
View file

@ -8,7 +8,7 @@ sh gen-version.sh test build
rm assets/extras.pak
python2.7 makepak.py xash-extras assets/extras.pak
$AAPT package -m -J gen/ --rename-manifest-package in.celest.xash3d.hl -M AndroidManifest.xml -S test/res -I $ANDROID_JAR
$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR src/org/libsdl/app/SDLActivity.java gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*
$JAVA_HOME/bin/javac -d bin/classes -s bin/classes -cp $ANDROID_JAR src/org/libsdl/app/SDLActivity.java gen/in/celest/xash3d/hl/R.java src/in/celest/xash3d/*.java
$DX --dex --output=bin/classes.dex bin/classes/
/mnt/app/apktool/aapt package -f -M test/AndroidManifest.xml -S test/res -I $ANDROID_JAR -F bin/xash3d.apk.unaligned
zip bin/xash3d.apk.unaligned assets/*

5
jni/Application.mk
View file

@ -4,15 +4,10 @@
#APP_STL := stlport_static
XASH_SDL ?= 0
XASH_LEGACY ?= 0
ifeq ($(XASH_SDL),1)
APP_PLATFORM := android-12
else
ifneq ($(XASH_LEGACY),1)
APP_PLATFORM := android-8
else
APP_PLATFORM := android-3
endif
endif

2
jni/src/Xash3D/xash3d

@ -1 +1 @@
Subproject commit b0de40024992fb7f7ecb40e4bacc5cb7484e06bc
Subproject commit ed8b3ea3a6eb80a20a43326c1ccb805f07ba28db

2
src/in/celest/xash3d/LauncherActivity.java
View file

@ -105,7 +105,7 @@ 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, XashActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
SharedPreferences.Editor editor = mPref.edit();

10
src/in/celest/xash3d/XashActivity.java
View file

@ -28,7 +28,7 @@ public class XashActivity extends Activity {
// Main components
protected static XashActivity mSingleton;
private static EngineSurface mSurface;
private static String mArgv[];
public static String mArgv[];
public static final int sdk = Integer.valueOf(Build.VERSION.SDK);
// Preferences
@ -126,12 +126,6 @@ public class XashActivity extends Activity {
msg.obj = data;
commandHandler.sendMessage(msg);
}
public static String[] getArguments()
{
return "-dev 5 -log +map crossfire -noch +deathmatch 1 +map crossfire".split(" ");
}
// C functions we call
public static native int nativeInit(Object arguments);
public static native void nativeQuit();
@ -274,7 +268,7 @@ class XashMain implements Runnable {
XashActivity.createGLContext();
XashActivity.nativeInit(XashActivity.getArguments());
XashActivity.nativeInit(XashActivity.mArgv);
//Log.v("SDL", "SDL thread terminated");
}

5
test/AndroidManifest.xml
View file

@ -77,9 +77,8 @@
android:screenOrientation="landscape"
android:label="@string/app_name">
<intent-filter>
<action android:name="org.libsdl.app.SDLActivity"/>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<action android:name="in.celest.xash3d.START" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<receiver android:name="in.celest.xash3d.InstallReceiver">