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

qb: Don't force threads for win32.

Browse Source
This commit is contained in:
orbea 2019-01-29 17:26:25 -08:00
parent 51cfc84b88
commit 921104a4fb
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
qb/config.libs.sh
View File

@ -149,19 +149,13 @@ if [ "$OS" = 'DOS' ]; then
HAVE_LANGEXTRA=no HAVE_LANGEXTRA=no
fi fi
check_lib '' THREADS "$PTHREADLIB" pthread_create
check_enabled THREADS THREAD_STORAGE 'Thread Local Storage' 'Threads are'
check_lib '' THREAD_STORAGE "$PTHREADLIB" pthread_key_create
if [ "$OS" = 'Win32' ]; then if [ "$OS" = 'Win32' ]; then
HAVE_THREADS=yes
HAVE_THREAD_STORAGE=yes
HAVE_DYLIB=yes HAVE_DYLIB=yes
else else
check_lib '' THREADS "$PTHREADLIB" pthread_create
if [ "$HAVE_THREADS" = 'yes' ]; then
check_lib '' THREAD_STORAGE "$PTHREADLIB" pthread_key_create
else
HAVE_THREAD_STORAGE=no
fi
check_lib '' DYLIB "$DYLIB" dlopen check_lib '' DYLIB "$DYLIB" dlopen
fi fi
@ -255,8 +249,8 @@ if [ "$HAVE_SDL2" = 'yes' ] && [ "$HAVE_SDL" = 'yes' ]; then
HAVE_SDL=no HAVE_SDL=no
fi fi
check_enabled CXX DISCORD discord 'the C++ compiler is' check_enabled CXX DISCORD discord 'The C++ compiler is'
check_enabled CXX QT 'Qt companion' 'the C++ compiler is' check_enabled CXX QT 'Qt companion' 'The C++ compiler is'
if [ "$HAVE_QT" != 'no' ]; then if [ "$HAVE_QT" != 'no' ]; then
check_pkgconf QT5CORE Qt5Core 5.2 check_pkgconf QT5CORE Qt5Core 5.2
@ -319,7 +313,7 @@ if [ "$HAVE_SSL" != 'no' ]; then
fi fi
fi fi
check_enabled THREADS LIBUSB libusb 'threads are' check_enabled THREADS LIBUSB libusb 'Threads are'
check_val '' LIBUSB -lusb-1.0 libusb-1.0 libusb-1.0 1.0.13 '' false check_val '' LIBUSB -lusb-1.0 libusb-1.0 libusb-1.0 1.0.13 '' false
if [ "$OS" = 'Win32' ]; then if [ "$OS" = 'Win32' ]; then
@ -380,14 +374,11 @@ fi
check_val '' MPV -lmpv '' mpv '' '' false check_val '' MPV -lmpv '' mpv '' '' false
if [ "$HAVE_THREADS" = 'no' ] && [ "$HAVE_FFMPEG" != 'no' ]; then
HAVE_FFMPEG='no'
die : 'Notice: Threads are not available, FFmpeg will also be disabled.'
fi
check_header DRMINGW exchndl.h check_header DRMINGW exchndl.h
check_lib '' DRMINGW -lexchndl check_lib '' DRMINGW -lexchndl
check_enabled THREADS FFMPEG FFmpeg 'Threads are'
if [ "$HAVE_FFMPEG" != 'no' ]; then if [ "$HAVE_FFMPEG" != 'no' ]; then
check_val '' AVCODEC -lavcodec '' libavcodec 54 '' false check_val '' AVCODEC -lavcodec '' libavcodec 54 '' false
check_val '' AVFORMAT -lavformat '' libavformat 54 '' false check_val '' AVFORMAT -lavformat '' libavformat 54 '' false
@ -498,8 +489,8 @@ fi
check_lib '' STRCASESTR "$CLIB" strcasestr check_lib '' STRCASESTR "$CLIB" strcasestr
check_lib '' MMAP "$CLIB" mmap check_lib '' MMAP "$CLIB" mmap
check_enabled CXX VULKAN vulkan 'the C++ compiler is' check_enabled CXX VULKAN vulkan 'The C++ compiler is'
check_enabled THREADS VULKAN vulkan 'threads are' check_enabled THREADS VULKAN vulkan 'Threads are'
if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then if [ "$HAVE_VULKAN" != "no" ] && [ "$OS" = 'Win32' ]; then
HAVE_VULKAN=yes HAVE_VULKAN=yes

8
qb/qb.libs.sh
View File

@ -49,11 +49,15 @@ check_enabled()
tmpval="$(eval "printf %s \"\$USER_$2\"")" tmpval="$(eval "printf %s \"\$USER_$2\"")"
if [ "$tmpval" != 'yes' ]; then if [ "$tmpval" != 'yes' ]; then
eval "HAVE_$2=no" setval="$(eval "printf %s \"\$HAVE_$2\"")"
if [ "$setval" != 'no' ]; then
eval "HAVE_$2=no"
die : "Notice: $4 disabled, $3 support will also be disabled."
fi
return 0 return 0
fi fi
die 1 "Forced to build with $3 support and $4 disabled. Exiting ..." die 1 "Error: $4 disabled and forced to build with $3 support."
} }
# check_lib: # check_lib: