Merge commit 'refs/merge-requests/218' of https://gitorious.org/f-droid/fdroiddata into merge-requests/218

This commit is contained in:
Ciaran Gultnieks 2013-10-30 18:29:49 +00:00
commit 484e8e3dab
2 changed files with 48 additions and 0 deletions

View file

@ -0,0 +1,34 @@
Category:Games
License:GPLv2+
Web Site:http://yabause.org
Source Code:http://sourceforge.net/p/yabause/code/
Issue Tracker:http://sourceforge.net/projects/yabause/support
Donate:http://sourceforge.net/p/yabause/donate/
Summary:Sega Saturn emulator
Description:
Yabause support booting games using Saturn cds or iso files. BIOS (optional) should be placed into
/sdcard/yabause/bios and games go in /sdcard/yabause/games.
[Compatibility list http://yabause.org/compatibility-list/]
Status: ALPHA
.
Repo Type:git
Repo:http://svn.code.sf.net/p/yabause/code/trunk/
# r3136 is the last, known to work for sure
Build Version:0.9.11,1,3136,buildjni=no,subdir=yabause/src/android,patch=toolchain.patch,\
build=\
cd ../.. && \
export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \
export ANDROID_NDK="$$NDK$$" && \
cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake \
-DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android \
-DYAB_PORTS=android . && make
Auto Update Mode:None
Update Check Mode:None
Current Version:0.9.11
Current Version Code:1

View file

@ -0,0 +1,14 @@
--- a/yabause/src/android/android.cmake
+++ b/yabause/src/android/android.cmake
@@ -5,7 +5,10 @@ SET(CMAKE_C_COMPILER arm-linux-androideabi-gcc)
SET(CMAKE_CXX_COMPILER arm-linux-androideabi-g++)
SET(CMAKE_ASM-ATT_COMPILER arm-linux-androideabi-as)
-SET(CMAKE_FIND_ROOT_PATH /home/guillaume/projects/android/toolchain/sysroot/usr/)
+SET(CMAKE_FIND_ROOT_PATH $ENV{ANDROID_NDK}/platforms/android-8/arch-arm/usr/)
+
+set(CMAKE_C_FLAGS "--sysroot=$ENV{ANDROID_NDK}/platforms/android-8/arch-arm" CACHE STRING "GCC flags" FORCE)
+set(CMAKE_CXX_FLAGS "--sysroot=$ENV{ANDROID_NDK}/platforms/android-8/arch-arm" CACHE STRING "G++ flags" FORCE)
SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)