Android makefiles, manifest and icon (#97)

This commit is contained in:
saschawillems 2016-03-20 16:27:32 +01:00
parent fed45eac20
commit 0ffc005c8f
4 changed files with 31 additions and 17 deletions

BIN
android/images/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View file

@ -1,4 +1,5 @@
/assets/ /assets/
/res/
/bin/ /bin/
/libs/ /libs/
/obj/ /obj/

View file

@ -1,10 +1,18 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.saschawillems.vulkanTriangle"> <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.saschawillems.vulkanTriangle"
android:versionCode="1"
android:versionName="1.0">
<uses-sdk android:minSdkVersion="19" /> <uses-sdk android:minSdkVersion="19" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<application android:label="vulkanTriangle" android:hasCode="false"> <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
<uses-feature android:name="android.hardware.gamepad" android:required="false"/>
<uses-feature android:name="android.software.leanback" android:required="false"/>
<application android:label="vulkanTriangle" android:icon="@drawable/icon" android:hasCode="false">
<activity android:name="android.app.NativeActivity" <activity android:name="android.app.NativeActivity"
android:label="vulkanTriangle" android:label="Vulkan Triangle"
android:theme="@android:style/Theme.NoTitleBar.Fullscreen" android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
android:launchMode="singleTask" android:launchMode="singleTask"
android:configChanges="orientation|screenSize|keyboardHidden"> android:configChanges="orientation|screenSize|keyboardHidden">
@ -12,6 +20,7 @@
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
</application> </application>

View file

@ -1,18 +1,22 @@
cd jni cd jni
call ndk-build call ndk-build
if %ERRORLEVEL% GEQ 1 ( if %ERRORLEVEL% EQU 0 (
echo ndk-build has failed, build cancelled echo ndk-build has failed, build cancelled
cd.. cd..
exit \b %errorlevel%
) mkdir "assets\shaders"
cd.. xcopy "..\..\data\shaders\triangle.vert.spv" "assets\shaders" /Y
xcopy "..\..\data\shaders\triangle.frag.spv" "assets\shaders" /Y
mkdir "assets\shaders"
xcopy "..\..\data\shaders\triangle.vert.spv" "assets\shaders" /Y mkdir "res\drawable"
xcopy "..\..\data\shaders\triangle.frag.spv" "assets\shaders" /Y xcopy "..\..\android\images\icon.png" "res\drawable" /Y
call ant debug -Dout.final.file=vulkanTriangle.apk call ant debug -Dout.final.file=vulkanTriangle.apk
if "%1" == "-deploy" ( if "%1" == "-deploy" (
adb install -r vulkanTriangle.apk adb install -r vulkanTriangle.apk
)
) ELSE (
echo error : ndk-build failed with errors!
cd..
) )