From 42e113612312c40c53de9dd9085d01c2a917a862 Mon Sep 17 00:00:00 2001 From: lisyarus Date: Wed, 4 Jan 2023 18:11:38 +0300 Subject: [PATCH] Remove sdl2-mixer dependency --- libs/audio/CMakeLists.txt | 4 +--- package/linux/toolchain.cmake | 1 - package/win/toolchain-target.cmake | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libs/audio/CMakeLists.txt b/libs/audio/CMakeLists.txt index e151eaad..fb1d4a2e 100644 --- a/libs/audio/CMakeLists.txt +++ b/libs/audio/CMakeLists.txt @@ -1,8 +1,6 @@ -find_package(SDL2_mixer REQUIRED) - file(GLOB_RECURSE PSEMEK_AUDIO_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "include/*.hpp" "include/*.h") file(GLOB_RECURSE PSEMEK_AUDIO_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "source/*.cpp" "source/*.c") psemek_add_library(psemek-audio ${PSEMEK_AUDIO_HEADERS} ${PSEMEK_AUDIO_SOURCES}) target_include_directories(psemek-audio PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") -target_link_libraries(psemek-audio PUBLIC psemek-sdl2 psemek-geom psemek-util psemek-log psemek-prof SDL2_mixer) +target_link_libraries(psemek-audio PUBLIC psemek-sdl2 psemek-geom psemek-util psemek-log psemek-prof) diff --git a/package/linux/toolchain.cmake b/package/linux/toolchain.cmake index 19ab71ef..d58a0838 100644 --- a/package/linux/toolchain.cmake +++ b/package/linux/toolchain.cmake @@ -9,7 +9,6 @@ set(PSEMEK_PACKAGE_TARGET ON) set(PSEMEK_PACKAGE_COPY_FILES ${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2-2.0.so.0 - ${PSEMEK_PACKAGE_ROOT}/sdl2/install/lib/libSDL2_mixer-2.0.so.0 ${PSEMEK_PACKAGE_ROOT}/libpng* ${PSEMEK_PACKAGE_ROOT}/libmpg123* ) diff --git a/package/win/toolchain-target.cmake b/package/win/toolchain-target.cmake index dff58710..152b6166 100644 --- a/package/win/toolchain-target.cmake +++ b/package/win/toolchain-target.cmake @@ -13,7 +13,6 @@ set(PSEMEK_PACKAGE_TOOLS_PATH "${PSEMEK_PACKAGE_ROOT}/tools") set(PSEMEK_PACKAGE_COPY_FILES ${PSEMEK_PACKAGE_ROOT}/sdl2/install/bin/SDL2.dll - ${PSEMEK_PACKAGE_ROOT}/sdl2/install/bin/SDL2_mixer.dll ${PSEMEK_PACKAGE_ROOT}/libmpg/install/bin/libmpg123-0.dll ${PSEMEK_PACKAGE_ROOT}/libpng/install/bin/libpng16-16.dll ${PSEMEK_PACKAGE_ROOT}/zlib/install/bin/zlib1.dll