mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Updated .gitignore and fixed an Android version problem

Browse source
This commit is contained in:
jules 2015-11-03 16:03:50 +00:00
parent 19572b58c7
commit 1107638f1e
4 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -47,4 +47,5 @@ profile
**/CodeBlocks/obj **/CodeBlocks/obj
**/CodeBlocks/*.depend **/CodeBlocks/*.depend
**/CodeBlocks/*.layout **/CodeBlocks/*.layout
**/Builds/AndroidStudio
doxygen/doc doxygen/doc

2
examples/Demo/Builds/Android/build.xml
View file

@ -17,7 +17,7 @@
<condition property="ndkDebugValue" value="NDK_DEBUG=1" else="NDK_DEBUG=0"> <condition property="ndkDebugValue" value="NDK_DEBUG=1" else="NDK_DEBUG=0">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/> <equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition> </condition>
<condition property="app_abis" value="armeabi armeabi-v7a" else="armeabi armeabi-v7a"> <condition property="app_abis" value="armeabi x86" else="armeabi armeabi-v7a x86">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/> <equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition> </condition>
<exec executable="${ndk.dir}/ndk-build" dir="${basedir}" failonerror="true"> <exec executable="${ndk.dir}/ndk-build" dir="${basedir}" failonerror="true">

4
examples/Demo/Builds/Android/jni/Application.mk
View file

@ -7,7 +7,7 @@ APP_PLATFORM := android-10
NDK_TOOLCHAIN_VERSION := 4.8 NDK_TOOLCHAIN_VERSION := 4.8
ifeq ($(NDK_DEBUG),1) ifeq ($(NDK_DEBUG),1)
APP_ABI := armeabi armeabi-v7a APP_ABI := armeabi x86
else else
APP_ABI := armeabi armeabi-v7a APP_ABI := armeabi armeabi-v7a x86
endif endif

2
examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java
View file

@ -1134,7 +1134,7 @@ public class MidiTest extends Activity
try try
{ {
instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_BREAK); instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_UNKNOWN);
} }
catch (Exception e) catch (Exception e)
{ {