From 00f0134cdbc0510441d1605761fe7f80debb3f25 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 18 Feb 2015 23:48:21 +0100 Subject: [PATCH 1/4] Change libretro SDK to libretro-common --- libretro-fetch.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libretro-fetch.sh b/libretro-fetch.sh index 28ac58c8..63214033 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -292,8 +292,8 @@ fetch_libretro_emux() { } # Shouldn't this be part of the tools fetch? Eh, later... -fetch_libretro_sdk() { - fetch_git "https://github.com/libretro/libretro-sdk.git" "libretro-sdk" "libretro/SDK" +fetch_libretro_common() { + fetch_git "https://github.com/libretro/libretro-common.git" "libretro-common" "libretro/common" } @@ -366,5 +366,5 @@ else fetch_libretro_tempgba fetch_libretro_gpsp fetch_libretro_emux - fetch_libretro_sdk + fetch_libretro_common fi From 72396efcba218eb2d99141cc8818d29b7ff36e31 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 19 Feb 2015 06:55:56 +0100 Subject: [PATCH 2/4] Add FUSE --- libretro-fetch.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libretro-fetch.sh b/libretro-fetch.sh index 63214033..4b8646f8 100755 --- a/libretro-fetch.sh +++ b/libretro-fetch.sh @@ -291,6 +291,10 @@ fetch_libretro_emux() { fetch_git "https://github.com/libretro/emux.git" "libretro-emux" "libretro/Emux" } +fetch_libretro_fuse() { + fetch_git "https://github.com/libretro/fuse-libretro.git" "libretro-fuse" "libretro/fuse" +} + # Shouldn't this be part of the tools fetch? Eh, later... fetch_libretro_common() { fetch_git "https://github.com/libretro/libretro-common.git" "libretro-common" "libretro/common" @@ -367,4 +371,5 @@ else fetch_libretro_gpsp fetch_libretro_emux fetch_libretro_common + fetch_libretro_fuse fi From 9aa517dc65dbc5f2f3e2805be8095a5f112266bc Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Thu, 19 Feb 2015 07:03:18 +0100 Subject: [PATCH 3/4] Add FUSE compilation for OSX and iOS --- libretro-build-common.sh | 4 ++++ libretro-build-ios.sh | 1 + libretro-build.sh | 2 ++ 3 files changed, 7 insertions(+) diff --git a/libretro-build-common.sh b/libretro-build-common.sh index 746542cb..f3d94981 100755 --- a/libretro-build-common.sh +++ b/libretro-build-common.sh @@ -265,6 +265,10 @@ build_libretro_gpsp() { build_libretro_generic_makefile "gpsp" "." "Makefile" $FORMAT_COMPILER_TARGET_ALT } +build_libretro_fuse() { + build_libretro_generic_makefile "fuse" "." "Makefile.libretro" $FORMAT_COMPILER_TARGET_ALT +} + build_libretro_vba_next() { build_libretro_generic_makefile "vba_next" "." "Makefile.libretro" $FORMAT_COMPILER_TARGET_ALT } diff --git a/libretro-build-ios.sh b/libretro-build-ios.sh index 9725ffef..65b952aa 100755 --- a/libretro-build-ios.sh +++ b/libretro-build-ios.sh @@ -180,6 +180,7 @@ else build_libretro_o2em build_libretro_hatari build_libretro_gpsp + build_libretro_fuse build_libretro_emux build_libretro_test if [ $FORMAT_COMPILER_TARGET != "ios" ]; then diff --git a/libretro-build.sh b/libretro-build.sh index 5cd2be44..db6b610c 100755 --- a/libretro-build.sh +++ b/libretro-build.sh @@ -178,7 +178,9 @@ else build_libretro_o2em build_libretro_hatari build_libretro_gpsp + build_libretro_fuse build_libretro_emux + build_libretro_fuse build_libretro_test if [ $FORMAT_COMPILER_TARGET != "ios" ]; then build_libretro_testgl From ea854caa1f8160448dd46d5388215c4ec6ba6f1a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 19 Feb 2015 07:18:32 +0100 Subject: [PATCH 4/4] Fixup QNX script --- libretro-build-qnx.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libretro-build-qnx.sh b/libretro-build-qnx.sh index f994239f..51115fa1 100755 --- a/libretro-build-qnx.sh +++ b/libretro-build-qnx.sh @@ -3,6 +3,7 @@ SCRIPT=$(readlink -f $0) BASE_DIR=$(dirname $SCRIPT) +WORKDIR=$PWD RARCH_DIR=$BASE_DIR/dist RARCH_DIST_DIR=$RARCH_DIR/qnx FORMAT=_qnx @@ -12,6 +13,10 @@ FORMAT_EXT=so JOBS=7 MAKE=make +CC="qcc -Vgcc_ntoarmv7le" +CXX="QCC -Vgcc_ntoarmv7le" +CXX11="QCC -Vgcc_ntoarmv7le" + . ./libretro-build-common.sh if [ $1 ]; then