Merge pull request #10009 from orbea/qb-win

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

View File

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

View File

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