Update android build scripts to copy pngs. Update native with bugfix.

This commit is contained in:
Henrik Rydgard 2013-12-12 20:43:23 +01:00
parent 9edf00e0f9
commit fbe2e730d0
5 changed files with 3 additions and 1 deletions

View File

@ -2,6 +2,7 @@ xcopy ..\flash0 assets\flash0 /s /y
xcopy ..\lang assets\lang /s /y
xcopy ..\assets\shaders assets\shaders /s /y
copy ..\assets\langregion.ini assets\langregion.ini
copy ..\assets\*.png assets
SET NDK=C:\AndroidNDK
SET NDK_MODULE_PATH=..;..\native\ext
REM Need to force target-platform to android-9 to get access to OpenSL headers.

View File

@ -2,4 +2,5 @@ cp -r ../flash0 assets
cp -r ../lang assets
cp -r ../assets/shaders assets
cp ../assets/langregion.ini assets/langregion.ini
cp ../assets/*.png assets
NDK_MODULE_PATH=..:../native/ext $NDK/ndk-build -j3 TARGET_PLATFORM=android-9 $*

BIN
android/assets/rargray.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
android/assets/zip.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

2
native

@ -1 +1 @@
Subproject commit c25cf61f54c02f439a934d0318849b16cfca8bde
Subproject commit b99b826f5218c633f1f79d75e8e3e0b0e795443a