From aa9055f4c35c84962e34bef00f0d933ef58719c0 Mon Sep 17 00:00:00 2001 From: Zion Nimchuk Date: Wed, 19 Feb 2020 08:20:39 -0800 Subject: [PATCH] Switch the AppImage building over to gcc from clang Turns out the current version of clang doesn't support the [[likely]] and [[unlikely]] attributes, so to ensure good performance, we'll be switching to gcc, at least for now. --- .travis.yml | 2 +- 3rdparty/CMakeLists.txt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1acb99871b..3b127cbb0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ jobs: env: - NAME="Linux build" - COMPILER="gcc" + - DEPLOY_APPIMAGE="true" services: docker cache: ccache compiler: gcc @@ -16,7 +17,6 @@ jobs: env: - NAME="Linux build" - COMPILER="clang" - - DEPLOY_APPIMAGE="true" services: docker cache: ccache compiler: clang diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index fc6a93940f..c9ae48e35b 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -337,10 +337,10 @@ if(USE_FAUDIO) if (NOT SDL2_FOUND OR SDL2_VERSION VERSION_LESS 2.0.9) message("-- RPCS3: FAudio requires SDL 2.0.9 or newer.") else() - set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library") - add_subdirectory(FAudio EXCLUDE_FROM_ALL) - target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO) - set(FAUDIO_TARGET FAudio) + set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library") + add_subdirectory(FAudio EXCLUDE_FROM_ALL) + target_compile_definitions(FAudio INTERFACE -DHAVE_FAUDIO) + set(FAUDIO_TARGET FAudio) endif() endif()