From 4a21907fee22ba05b2a2f005bfc189ba4e69a5b6 Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Sun, 26 Dec 2021 16:56:43 +0100 Subject: [PATCH] 3rdParty: remove mupen64plus-audio-sdl --- CMakeLists.txt | 3 --- Source/3rdParty/CMakeLists.txt | 21 --------------------- 2 files changed, 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa0b0a47..c09fc529 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,9 +45,6 @@ install(FILES ${MUPEN64PLUSCORE_INI} ${MUPEN64PLUSCORE_CHT} Data/font.ttf install(FILES Config/stylesheet.qss DESTINATION ${INSTALL_PATH}/Config ) -install(FILES ${MUPEN64PLUS_PLUGIN_AUDIO} - DESTINATION ${INSTALL_PATH}/Plugin/Audio -) install(FILES ${MUPEN64PLUS_PLUGIN_RSP_HLE} DESTINATION ${INSTALL_PATH}/Plugin/RSP ) diff --git a/Source/3rdParty/CMakeLists.txt b/Source/3rdParty/CMakeLists.txt index f105d35e..88a260ed 100644 --- a/Source/3rdParty/CMakeLists.txt +++ b/Source/3rdParty/CMakeLists.txt @@ -33,24 +33,6 @@ ExternalProject_Add(mupen64plus-core set(APIDIR "${CMAKE_BINARY_DIR}/Source/3rdParty/mupen64plus-core/src/api") -ExternalProject_Add(mupen64plus-audio-sdl - SOURCE_DIR mupen64plus-audio-sdl2/ - - CONFIGURE_COMMAND "" - INSTALL_COMMAND "" - - GIT_REPOSITORY https://github.com/Rosalie241/mupen64plus-audio-sdl2 - GIT_TAG cc6aca5a13b0b8ca7a2f9f5fa472ed3bb7f817db - - BUILD_COMMAND make all APIDIR=${APIDIR} DEBUG=$ - BUILD_IN_SOURCE False - - BINARY_DIR ${THIRDPARTY_DIR}/mupen64plus-audio-sdl2/projects/unix - - BUILD_BYPRODUCTS ${THIRDPARTY_DIR}/mupen64plus-audio-sdl2/projects/unix/mupen64plus-audio-sdl2.${SO_EXT} - DEPENDS mupen64plus-core -) - ExternalProject_Add(mupen64plus-rsp-hle SOURCE_DIR mupen64plus-rsp-hle/ @@ -168,9 +150,6 @@ set(MUPEN64PLUSCORE_LIB ${BUILD_BYPRODUCTS} PARENT_SCOPE) set(MUPEN64PLUSCORE_INI ${M64P_CORE_DIR}/data/mupen64plus.ini PARENT_SCOPE) set(MUPEN64PLUSCORE_CHT ${M64P_CORE_DIR}/data/mupencheat.txt PARENT_SCOPE) -ExternalProject_Get_property(mupen64plus-audio-sdl BUILD_BYPRODUCTS) -set(MUPEN64PLUS_PLUGIN_AUDIO ${BUILD_BYPRODUCTS} PARENT_SCOPE) - ExternalProject_Get_property(mupen64plus-rsp-hle BUILD_BYPRODUCTS) set(MUPEN64PLUS_PLUGIN_RSP_HLE ${BUILD_BYPRODUCTS} PARENT_SCOPE)