From e7c586246c7e43af532e9acf000e473e9d7b55b2 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Wed, 25 Oct 2023 23:47:41 +0300 Subject: D587 Post merge fmod issues fix --- indra/cmake/Copy3rdPartyLibs.cmake | 3 ++- indra/newview/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'indra') diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index a3db02372d..7938d4f54b 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -86,7 +86,8 @@ if(WINDOWS) endif (USE_BUGSPLAT) if (TARGET ll::fmodstudio) - set(debug_files ${debug_files} fmodL.dll) + # fmodL is included for logging, only one should be picked by manifest + set(release_files ${release_files} fmodL.dll) set(release_files ${release_files} fmod.dll) endif () diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 2c45e0713c..fd029c9f81 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -1740,7 +1740,7 @@ if (WINDOWS) if (TARGET ll::fmodstudio) list(APPEND COPY_INPUT_DEPENDENCIES ${SHARED_LIB_STAGING_DIR}/fmod.dll - ${SHARED_LIB_STAGING_DIR}/Debug/fmodL.dll + ${SHARED_LIB_STAGING_DIR}/fmodL.dll ) endif () -- cgit v1.2.3