mirror of
https://github.com/libretro/RetroArch.git
synced 2024-11-23 16:09:47 +00:00
420b7913d4
2820ab0b51 Merge pull request #1076 from KhronosGroup/bitcast-pre-330-glsl 63bcbd511e GLSL: Need extension to use bitcast on GLSL < 330. 9f3bebe3d0 Merge pull request #1075 from lifpan/master b11c20fc1d Remove unreasonable assertion for OpTypeImage Sampled parameter. 1a592b7c0f Merge pull request #1067 from cdavis5e/msl-scalar-block-layout 28454facbb MSL: Handle packed matrices. ea5c0ed82f MSL: Fix alignment of packed types. 44f688bf0b Merge pull request #1070 from KhronosGroup/fix-1066 25c74b324e Forget loop variable enables after emitting block chain. 6b010e0cbc Merge pull request #1069 from KhronosGroup/fix-1053 f6f849397e MSL: Re-roll array expressions in initializers. e5fa7edfd6 MSL: Support scalar block layout. git-subtree-dir: deps/SPIRV-Cross git-subtree-split: 2820ab0b51bf5e4187435d904b34e762b988f48b
38 lines
1.6 KiB
Diff
38 lines
1.6 KiB
Diff
diff --git a/pkg/android/phoenix/AndroidManifest.xml b/pkg/android/phoenix/AndroidManifest.xml
|
|
index ce2114c..12d8fbb 100644
|
|
--- a/pkg/android/phoenix/AndroidManifest.xml
|
|
+++ b/pkg/android/phoenix/AndroidManifest.xml
|
|
@@ -21,7 +21,8 @@
|
|
android:label="RetroArch"
|
|
android:hasCode="true"
|
|
android:isGame="true"
|
|
- android:banner="@drawable/banner">
|
|
+ android:banner="@drawable/banner"
|
|
+ android:debuggable="true">
|
|
<meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" />
|
|
<activity android:name="com.retroarch.browser.mainmenu.MainMenuActivity" android:exported="true" android:launchMode="singleInstance">
|
|
<intent-filter>
|
|
diff --git a/pkg/android/phoenix/build.xml b/pkg/android/phoenix/build.xml
|
|
index 9698a04..6b2c101 100644
|
|
--- a/pkg/android/phoenix/build.xml
|
|
+++ b/pkg/android/phoenix/build.xml
|
|
@@ -96,7 +96,7 @@
|
|
<replaceregexp
|
|
file="AndroidManifest.xml"
|
|
match="(android:debuggable=").*(")"
|
|
- replace="\1false\2"/>
|
|
+ replace="\1true\2"/>
|
|
</else>
|
|
</if>
|
|
<exec executable="${ndk.dir}/${ndk.cmd}" failonerror="true">
|
|
diff --git a/pkg/android/phoenix/jni/Application.mk b/pkg/android/phoenix/jni/Application.mk
|
|
index b179dbf..84ade89 100644
|
|
--- a/pkg/android/phoenix/jni/Application.mk
|
|
+++ b/pkg/android/phoenix/jni/Application.mk
|
|
@@ -1,3 +1,5 @@
|
|
+APP_OPTIM := debug
|
|
+
|
|
ifeq ($(GLES),3)
|
|
ifndef NDK_GL_HEADER_VER
|
|
APP_PLATFORM := android-18
|