mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-01-07 09:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in which check_opengl() would add extraneous -opengl flags

Browse Source 
Also, moved the libretro gl ports to the end of the build script so that check_opengl() modifies FORMAT_COMPILER_TARGET after the other libretro ports are built to ensure that the platform flag passed to the non-gl libetro cores are correct
This commit is contained in:
Cray Elliott 2013-09-04 18:11:59 -07:00
parent 9a6bc5f264
commit 64b9c352ca
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretro-build-common.sh
View File

@ -47,7 +47,6 @@ build_libretro_ffmpeg()
cd "$BASE_DIR" cd "$BASE_DIR"
if [ -d "libretro-ffmpeg" ]; then if [ -d "libretro-ffmpeg" ]; then
echo "=== Checking OpenGL dependencies ===" echo "=== Checking OpenGL dependencies ==="
check_opengl
echo "=== Building FFmpeg ===" echo "=== Building FFmpeg ==="
cd libretro-ffmpeg cd libretro-ffmpeg
${MAKE} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean FFmpeg" ${MAKE} platform=$FORMAT_COMPILER_TARGET -j$JOBS clean || die "Failed to clean FFmpeg"
@ -400,7 +399,6 @@ build_libretro_modelviewer()
cd "$BASE_DIR" cd "$BASE_DIR"
if [ -d "libretro-gl-modelviewer" ]; then if [ -d "libretro-gl-modelviewer" ]; then
echo "=== Building Modelviewer (GL) ===" echo "=== Building Modelviewer (GL) ==="
check_opengl
cd libretro-gl-modelviewer cd libretro-gl-modelviewer
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean Modelviewer" ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean Modelviewer"
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build Modelviewer" ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build Modelviewer"
@ -415,7 +413,6 @@ build_libretro_scenewalker()
cd "$BASE_DIR" cd "$BASE_DIR"
if [ -d "libretro-gl-scenewalker" ]; then if [ -d "libretro-gl-scenewalker" ]; then
echo "=== Building SceneWalker (GL) ===" echo "=== Building SceneWalker (GL) ==="
check_opengl
cd libretro-gl-scenewalker cd libretro-gl-scenewalker
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean SceneWalker" ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean SceneWalker"
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build SceneWalker" ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build SceneWalker"
@ -430,7 +427,6 @@ build_libretro_instancingviewer()
cd "$BASE_DIR" cd "$BASE_DIR"
if [ -d "libretro-gl-instancingviewer" ]; then if [ -d "libretro-gl-instancingviewer" ]; then
echo "=== Building Instancing Viewer (GL) ===" echo "=== Building Instancing Viewer (GL) ==="
check_opengl
cd libretro-gl-instancingviewer cd libretro-gl-instancingviewer
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean InstancingViewer" ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS clean || die "Failed to clean InstancingViewer"
${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build InstancingViewer" ${MAKE} -f Makefile platform=${FORMAT_COMPILER_TARGET} $COMPILER -j$JOBS || die "Failed to build InstancingViewer"
@ -524,7 +520,6 @@ build_libretro_mupen64()
{ {
cd "$BASE_DIR" cd "$BASE_DIR"
if [ -d "libretro-mupen64plus" ]; then if [ -d "libretro-mupen64plus" ]; then
check_opengl
cd libretro-mupen64plus cd libretro-mupen64plus
mkdir -p obj mkdir -p obj
if [ "$X86" ] && [ "$X86_64" ]; then if [ "$X86" ] && [ "$X86_64" ]; then

15
libretro-build.sh
View File

@ -84,13 +84,6 @@ mkdir -p "$RARCH_DIST_DIR"
if [ $1 ]; then if [ $1 ]; then
$1 $1
else else
build_libretro_modelviewer
build_libretro_scenewalker
build_libretro_instancingviewer
if [ -z $BUILD_EXPERIMENTAL ]; then
build_libretro_mupen64
build_libretro_ffmpeg
fi
build_libretro_bsnes build_libretro_bsnes
build_libretro_mednafen build_libretro_mednafen
build_libretro_mednafen_gba build_libretro_mednafen_gba
@ -119,5 +112,13 @@ fi
if [ $FORMAT_COMPILER_TARGET != "win" ]; then if [ $FORMAT_COMPILER_TARGET != "win" ]; then
build_libretro_desmume build_libretro_desmume
build_libretro_pcsx_rearmed build_libretro_pcsx_rearmed
fi
check_opengl
build_libretro_modelviewer
build_libretro_scenewalker
build_libretro_instancingviewer
if [ -z $BUILD_EXPERIMENTAL ]; then
build_libretro_mupen64
build_libretro_ffmpeg
fi fi
fi fi