Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'disable-sdl-macos'

Browse Source 
Disable the use of SDL under macOS, it doesn't compile nor is needed
there.

See https://github.com/wxWidgets/wxWidgets/pull/1217
This commit is contained in:
Vadim Zeitlin
2019-02-03 22:54:32 +01:00
parent efa1e8f4ff 606659d27c
commit 679decd81d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/cmake/init.cmake
View File

@@ -362,7 +362,7 @@ if(wxUSE_GUI)
set(wxUSE_GSTREAMER_PLAYER OFF) set(wxUSE_GSTREAMER_PLAYER OFF)
endif() endif()
if(wxUSE_SOUND AND UNIX AND wxUSE_LIBSDL) if(wxUSE_SOUND AND wxUSE_LIBSDL AND UNIX AND NOT APPLE)
find_package(SDL2) find_package(SDL2)
if(NOT SDL2_FOUND) if(NOT SDL2_FOUND)
find_package(SDL) find_package(SDL)

2
configure vendored
View File

@@ -34514,7 +34514,7 @@ fi
WITH_PLUGIN_SDL=0 WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = 1 ; then if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then
if test "$wxUSE_LIBSDL" != "no"; then if test "$wxUSE_LIBSDL" != "no"; then
pkg_failed=no pkg_failed=no

2
configure.in
View File

@@ -5560,7 +5560,7 @@ fi
WITH_PLUGIN_SDL=0 WITH_PLUGIN_SDL=0
if test "$wxUSE_SOUND" = "yes"; then if test "$wxUSE_SOUND" = "yes"; then
if test "$USE_UNIX" = 1 ; then if test "$USE_UNIX" = 1 -a "$USE_MAC" != 1 ; then
if test "$wxUSE_LIBSDL" != "no"; then if test "$wxUSE_LIBSDL" != "no"; then
PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0.0], PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0.0],
[ [