diff options
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 3 | ||||
| -rw-r--r-- | indra/newview/CMakeLists.txt | 2 | 
2 files changed, 3 insertions, 2 deletions
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 ()  | 
