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

Merge branch 'master' of https://github.com/SDLash3D/xash3d-android-project into remove-sdl

Browse source
This commit is contained in:
mittorn 2016-08-05 17:43:55 +00:00
commit 6f5ccd4239
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
debug.sh
View file

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" XASH_SDL=1 ndk-build NDK_TOOLCHAIN_VERSION=4.8 NDK_DEBUG=1 SUPPORT_WEBP=false V=1 -j3 APP_CFLAGS="-gdwarf-3" XASH_SDL=0
sh gen-version.sh default-debug sh gen-version.sh default-debug
rm assets/extras.pak 2>/dev/null rm assets/extras.pak 2>/dev/null
python2 makepak.py xash-extras assets/extras.pak python2 makepak.py xash-extras assets/extras.pak

2
jni/src/Xash3D/xash3d

@ -1 +1 @@
Subproject commit a114800ce16bbde98d083c0b63e8782d6bbbfa2f Subproject commit 1b6ab50478f7c9460bd5a699fc05d3c720a6a40d

3
res/layout/about.xml
View file

@ -48,8 +48,7 @@
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/about_links" android:text="@string/about_links"
android:id="@+id/textView6" android:id="@+id/textView6"
android:autoText="false" android:autoText="false" />
android:autoLink="web" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"

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

@ -7,6 +7,7 @@ import android.app.AlertDialog;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Build; import android.os.Build;
import android.text.method.LinkMovementMethod;
import android.os.Environment; import android.os.Environment;
import android.view.Menu; import android.view.Menu;
@ -221,6 +222,8 @@ public class LauncherActivity extends Activity {
dialog.setContentView(R.layout.about); dialog.setContentView(R.layout.about);
dialog.setCancelable(true); dialog.setCancelable(true);
dialog.show(); dialog.show();
TextView tView6 = (TextView) dialog.findViewById(R.id.textView6);
tView6.setMovementMethod(LinkMovementMethod.getInstance());
} }
}); });
} }