From f60df8fd777115aa5944f516f0a1f3765243fbd3 Mon Sep 17 00:00:00 2001 From: staphen Date: Sun, 2 May 2021 18:48:42 -0400 Subject: [PATCH] 3DS: Removed unnecessary dependencies --- CMake/ctr/n3ds_defs.cmake | 4 ---- CMakeLists.txt | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CMake/ctr/n3ds_defs.cmake b/CMake/ctr/n3ds_defs.cmake index be423c4e3..a0aa8c3be 100644 --- a/CMake/ctr/n3ds_defs.cmake +++ b/CMake/ctr/n3ds_defs.cmake @@ -12,10 +12,6 @@ list(APPEND CMAKE_MODULE_PATH "${DevilutionX_SOURCE_DIR}/CMake/ctr/modules") find_package(CITRO3D REQUIRED) find_package(FREETYPE REQUIRED) find_package(BZIP2 REQUIRED) -find_package(Tremor REQUIRED) -find_package(OGG REQUIRED) -find_package(MIKMOD REQUIRED) -find_package(MAD REQUIRED) find_package(PNG REQUIRED) #additional compilation definitions diff --git a/CMakeLists.txt b/CMakeLists.txt index 7882bec63..4f6fbc71d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -687,9 +687,7 @@ if (VITA) endif() if(N3DS) - target_link_libraries(${BIN_TARGET} PRIVATE ${TREMOR_LIBRARIES}) - target_include_directories(${BIN_TARGET} PRIVATE ${TREMOR_INCLUDE_DIRS}) - target_link_libraries(${BIN_TARGET} PRIVATE 3ds::ogg 3ds::mikmod 3ds::mad 3ds::freetype 3ds::bzip2 3ds::png) + target_link_libraries(${BIN_TARGET} PRIVATE 3ds::freetype 3ds::bzip2 3ds::png) target_link_libraries(${BIN_TARGET} PRIVATE 3ds::citro3d 3ds::ctrulib) endif()