revert libsamplerate addition
sadge
This commit is contained in:
parent
4f511c2aaa
commit
bef86811c9
2
.github/workflows/build_linux.yml
vendored
2
.github/workflows/build_linux.yml
vendored
@ -20,7 +20,7 @@ jobs:
|
|||||||
- name: Install Packages
|
- name: Install Packages
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y pkg-config libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsamplerate0-dev libsdl2-dev
|
sudo apt-get install -y pkg-config libxmu-dev libxi-dev libgl-dev libglu1-mesa-dev libsdl2-dev
|
||||||
|
|
||||||
- name: Install CMake & Ninja
|
- name: Install CMake & Ninja
|
||||||
uses: lukka/get-cmake@latest
|
uses: lukka/get-cmake@latest
|
||||||
|
@ -486,11 +486,9 @@ set(STAR_EXT_LIBS ${STAR_EXT_LIBS}
|
|||||||
)
|
)
|
||||||
|
|
||||||
if(STAR_BUILD_GUI)
|
if(STAR_BUILD_GUI)
|
||||||
find_package(SampleRate CONFIG REQUIRED)
|
|
||||||
find_package(SDL2 CONFIG REQUIRED)
|
find_package(SDL2 CONFIG REQUIRED)
|
||||||
|
|
||||||
set(STAR_EXT_GUI_LIBS
|
set(STAR_EXT_GUI_LIBS
|
||||||
SampleRate::samplerate
|
|
||||||
$<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
|
$<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
|
||||||
$<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
|
$<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
|
||||||
)
|
)
|
||||||
|
@ -271,9 +271,6 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
Logger::info("Application: Initializing SDL Audio");
|
Logger::info("Application: Initializing SDL Audio");
|
||||||
#if SDL_VERSION_ATLEAST(2, 0, 26)
|
|
||||||
SDL_SetHint(SDL_HINT_AUDIO_RESAMPLING_MODE, "fast");
|
|
||||||
#endif
|
|
||||||
if (SDL_InitSubSystem(SDL_INIT_AUDIO))
|
if (SDL_InitSubSystem(SDL_INIT_AUDIO))
|
||||||
throw ApplicationException(strf("Couldn't initialize SDL Audio: {}", SDL_GetError()));
|
throw ApplicationException(strf("Couldn't initialize SDL Audio: {}", SDL_GetError()));
|
||||||
|
|
||||||
|
@ -2,11 +2,7 @@
|
|||||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
"glew",
|
"glew",
|
||||||
"libsamplerate",
|
"sdl2",
|
||||||
{
|
|
||||||
"name": "sdl2",
|
|
||||||
"features": [ "samplerate" ]
|
|
||||||
},
|
|
||||||
"libvorbis",
|
"libvorbis",
|
||||||
"zlib",
|
"zlib",
|
||||||
"freetype",
|
"freetype",
|
||||||
|
Loading…
Reference in New Issue
Block a user