Skip to content

Commit

Permalink
Switch the AppImage building over to gcc from clang
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
hcorion authored and Nekotekina committed Feb 19, 2020
1 parent 9d1833c commit aa9055f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ jobs:
env:
- NAME="Linux build"
- COMPILER="gcc"
- DEPLOY_APPIMAGE="true"
services: docker
cache: ccache
compiler: gcc
Expand All @@ -16,7 +17,6 @@ jobs:
env:
- NAME="Linux build"
- COMPILER="clang"
- DEPLOY_APPIMAGE="true"
services: docker
cache: ccache
compiler: clang
Expand Down
8 changes: 4 additions & 4 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down

0 comments on commit aa9055f

Please sign in to comment.