mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2024-12-01 04:03:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Alternative fix to issue #114: in the c1f950767e commit, I assumed some things

Browse Source 
which weren't right. This commit just makes the minimal changes to let o2em
compile successfully.
This commit is contained in:
tomgar 2014-10-05 12:09:13 +01:00
parent 6f2a9f97fd
commit 0a66a64d74
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libretro-build-common.sh
View File

@ -24,6 +24,8 @@ echo "Compiler: ${COMPILER}"
echo "${FORMAT_COMPILER_TARGET}" echo "${FORMAT_COMPILER_TARGET}"
echo "${FORMAT_COMPILER_TARGET_ALT}" echo "${FORMAT_COMPILER_TARGET_ALT}"
RESET_FORMAT_COMPILER_TARGET=$FORMAT_COMPILER_TARGET
RESET_FORMAT_COMPILER_TARGET_ALT=$FORMAT_COMPILER_TARGET_ALT
check_opengl() { check_opengl() {
if [ "${BUILD_LIBRETRO_GL}" ]; then if [ "${BUILD_LIBRETRO_GL}" ]; then
@ -41,6 +43,11 @@ check_opengl() {
fi fi
} }
reset_compiler_targets() {
export FORMAT_COMPILER_TARGET=$RESET_FORMAT_COMPILER_TARGET
export FORMAT_COMPILER_TARGET_ALT=$RESET_FORMAT_COMPILER_TARGET_ALT
}
build_libretro_pcsx_rearmed_interpreter() { build_libretro_pcsx_rearmed_interpreter() {
cd "${BASE_DIR}" cd "${BASE_DIR}"
if [ -d 'libretro-pcsx-rearmed' ]; then if [ -d 'libretro-pcsx-rearmed' ]; then
@ -281,15 +288,13 @@ build_libretro_fb_alpha() {
build_libretro_ffmpeg() { build_libretro_ffmpeg() {
check_opengl check_opengl
build_libretro_generic_makefile "ffmpeg" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET} build_libretro_generic_makefile "ffmpeg" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
# reset check_opengl reset_compiler_targets
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
} }
build_libretro_3dengine() { build_libretro_3dengine() {
check_opengl check_opengl
build_libretro_generic_makefile "3dengine" "." "Makefile" ${FORMAT_COMPILER_TARGET} build_libretro_generic_makefile "3dengine" "." "Makefile" ${FORMAT_COMPILER_TARGET}
# reset check_opengl reset_compiler_targets
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
} }
build_libretro_scummvm() { build_libretro_scummvm() {
@ -299,8 +304,7 @@ build_libretro_scummvm() {
build_libretro_ppsspp() { build_libretro_ppsspp() {
check_opengl check_opengl
build_libretro_generic_makefile "ppsspp" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET} build_libretro_generic_makefile "ppsspp" "libretro" "Makefile" ${FORMAT_COMPILER_TARGET}
# reset check_opengl reset_compiler_targets
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
} }
@ -543,8 +547,7 @@ build_libretro_mupen64() {
else else
echo 'Mupen64 Plus not fetched, skipping ...' echo 'Mupen64 Plus not fetched, skipping ...'
fi fi
# reset check_opengl reset_compiler_targets
export FORMAT_COMPILER_TARGET="${FORMAT_COMPILER_TARGET}"
} }
create_dist_dir() { create_dist_dir() {