mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10009 from orbea/qb-win

Browse Source 
qb: Clean up.
This commit is contained in:
Twinaphex 2020-01-15 07:52:30 +01:00 committed by GitHub
commit 76c97bbfad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qb/config.libs.sh
View File

@ -113,22 +113,19 @@ if [ "$HAVE_ANGLE" = 'yes' ]; then
add_opt OPENGLES yes add_opt OPENGLES yes
add_define MAKEFILE OPENGLES_LIBS "-lGLESv2" add_define MAKEFILE OPENGLES_LIBS "-lGLESv2"
case "$(uname -s)" in case "$PLATFORM_NAME" in
MINGW32*) MINGW32* )
add_dirs LIBRARY ./pkg/windows/x86 add_dirs LIBRARY ./pkg/windows/x86
;; ;;
MINGW64*) MINGW64* )
add_dirs LIBRARY ./pkg/windows/x86_64 add_dirs LIBRARY ./pkg/windows/x86_64
;; ;;
*) esac
;;
esac
else else
check_header EGL EGL/egl.h EGL/eglext.h check_header EGL EGL/egl.h EGL/eglext.h
# some systems have EGL libs, but no pkgconfig # some systems have EGL libs, but no pkgconfig
# https://github.com/linux-sunxi/sunxi-mali/pull/8 # https://github.com/linux-sunxi/sunxi-mali/pull/8
check_val '' EGL "-l${VC_PREFIX}EGL $EXTRA_GL_LIBS" '' "${VC_PREFIX}egl" '' '' true check_val '' EGL "-l${VC_PREFIX}EGL $EXTRA_GL_LIBS" '' "${VC_PREFIX}egl" '' '' true
fi fi
if [ "$HAVE_EGL" = 'yes' ]; then if [ "$HAVE_EGL" = 'yes' ]; then

4
qb/qb.system.sh
View File

@ -1,3 +1,5 @@
PLATFORM_NAME="$(uname -s)"
if [ -n "${CROSS_COMPILE:=}" ]; then if [ -n "${CROSS_COMPILE:=}" ]; then
case "$CROSS_COMPILE" in case "$CROSS_COMPILE" in
*'-mingw32'*) OS='Win32';; *'-mingw32'*) OS='Win32';;
@ -7,7 +9,7 @@ if [ -n "${CROSS_COMPILE:=}" ]; then
fi fi
if [ -z "$CROSS_COMPILE" ] || [ -z "$OS" ]; then if [ -z "$CROSS_COMPILE" ] || [ -z "$OS" ]; then
case "$(uname)" in case "$PLATFORM_NAME" in
'Linux') OS='Linux';; 'Linux') OS='Linux';;
*'BSD') OS='BSD';; *'BSD') OS='BSD';;
'Darwin') OS='Darwin';; 'Darwin') OS='Darwin';;