Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Build FAudio with AppImage, use GCC with AppImage #7530

Merged
merged 3 commits into from
Feb 19, 2020
Merged

Build FAudio with AppImage, use GCC with AppImage #7530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2fe6a52
Bump FAudio depedency, set FAudio to build statically, enable FAudio …
hcorion Feb 19, 2020
32709a8
Switch the AppImage building over to gcc from clang
hcorion Feb 19, 2020
b3d7818
Merge branch 'master' into faudio-fix
Nekotekina Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion .travis/build-linux.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ else
export CXX=${CLANGXX_BINARY}
fi

cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -DUSE_FAUDIO=OFF -G Ninja
cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_LLVM_SUBMODULE=OFF -DLLVM_DIR=llvmlibs/lib/cmake/llvm/ -DUSE_NATIVE_INSTRUCTIONS=OFF -G Ninja

ninja; build_status=$?;

Expand Down
1 change: 1 addition & 0 deletions 3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@ 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)
Expand Down
2 changes: 1 addition & 1 deletion 3rdparty/FAudio
Open in desktop
Submodule FAudio updated 46 files
+1 −0 .github/FUNDING.yml
+12 −3 CMakeLists.txt
+1 −1 LICENSE
+1 −0 cpp/xaudio2.cpp
+19 −0 csharp/FAudio-CS.Core.csproj
+3 −2 csharp/FAudio-CS.csproj
+15 −3 csharp/FAudio.cs
+1 −1 csharp/LICENSE
+1 −1 csharp/Makefile
+0 −0 csharp/app.config
+1 −1 include/F3DAudio.h
+1 −1 include/FACT.h
+1 −1 include/FACT3D.h
+1 −1 include/FAPO.h
+1 −1 include/FAPOBase.h
+1 −1 include/FAPOFX.h
+4 −3 include/FAudio.h
+1 −1 include/FAudioFX.h
+1 −1 src/F3DAudio.c
+134 −50 src/FACT.c
+1 −1 src/FACT3D.c
+48 −13 src/FACT_internal.c
+20 −1 src/FACT_internal.h
+1 −1 src/FAPOBase.c
+1 −1 src/FAPOFX.c
+1 −1 src/FAPOFX_echo.c
+1 −1 src/FAPOFX_eq.c
+1 −1 src/FAPOFX_masteringlimiter.c
+1 −1 src/FAPOFX_reverb.c
+360 −5 src/FAudio.c
+1 −1 src/FAudioFX_reverb.c
+1 −1 src/FAudioFX_volumemeter.c
+1 −1 src/FAudio_ffmpeg.c
+4 −4 src/FAudio_internal.c
+27 −1 src/FAudio_internal.h
+1 −1 src/FAudio_internal_simd.c
+1 −1 src/FAudio_operationset.c
+26 −1 src/FAudio_platform_sdl2.c
+1 −1 src/XNA_Song.c
+271 −195 src/stb_vorbis.h
+1 −1 utils/facttool/facttool.cpp
+369 −0 utils/showriffheader/showriffheader.cpp
+1 −1 utils/testparse/testparse.c
+21 −7 utils/testxwma/testxwma.cpp
+1 −1 utils/uicommon/FAudioUI_main.cpp
+1 −1 utils/uicommon/FAudioUI_ui.cpp