From 2304dce93cdd21a2f176f82330a7a7d2451d00af Mon Sep 17 00:00:00 2001 From: marauder2k7 Date: Thu, 12 Mar 2026 22:03:50 +0000 Subject: [PATCH] fix --- Tools/CMake/modules/openal.cmake | 30 ------------------------------ Tools/CMake/torque_configs.cmake | 2 +- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 Tools/CMake/modules/openal.cmake diff --git a/Tools/CMake/modules/openal.cmake b/Tools/CMake/modules/openal.cmake deleted file mode 100644 index 8e6ebe2c2..000000000 --- a/Tools/CMake/modules/openal.cmake +++ /dev/null @@ -1,30 +0,0 @@ -# OpenAL module -option(TORQUE_SFX_OPENAL "Use OpenAL SFX" ON) - -if(TORQUE_SFX_OPENAL) - message("Enabling OpenAL Module") - - torqueAddSourceDirectories("${CMAKE_SOURCE_DIR}/Engine/source/sfx/openal") - - if (APPLE) - torqueAddSourceDirectories("${CMAKE_SOURCE_DIR}/Engine/source/sfx/openal/mac") - elseif (WIN32) - torqueAddSourceDirectories("${CMAKE_SOURCE_DIR}/Engine/source/sfx/openal/win32") - elseif (UNIX) - torqueAddSourceDirectories("${CMAKE_SOURCE_DIR}/Engine/source/sfx/openal/linux") - else() - message(FATAL_ERROR "Unsupported OpenAL platform.") - endif (APPLE) - - set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} OpenAL) - - # Since OpenAL lives elsewhere we need to ensure it is known to Torque when providing a link to it - set(ALSOFT_EXAMPLES OFF CACHE BOOL "OpenAL Examples" FORCE) - set(ALSOFT_UTILS OFF CACHE BOOL "OpenAL Utilities" FORCE) - set(ALSOFT_UPDATE_BUILD_VERSION OFF CACHE BOOL "Update build Version" UPDATE) - - add_subdirectory("${TORQUE_LIB_ROOT_DIRECTORY}/openal-soft" ${TORQUE_LIB_TARG_DIRECTORY}/openal-soft EXCLUDE_FROM_ALL) - if(APPLE) - target_compile_options(OpenAL PRIVATE -Wno-error=undef) - endif() -endif(TORQUE_SFX_OPENAL) diff --git a/Tools/CMake/torque_configs.cmake b/Tools/CMake/torque_configs.cmake index 241fb1e9e..4fa282e44 100644 --- a/Tools/CMake/torque_configs.cmake +++ b/Tools/CMake/torque_configs.cmake @@ -97,7 +97,7 @@ set(TORQUE_COMPILE_DEFINITIONS ICE_NO_DLL PCRE_STATIC TORQUE_ADVANCED_LIGHTING T TORQUE_UNICODE UNICODE _UNICODE) # All link libraries. Modules should append to this the path to specify additional link libraries (.a, .lib, .dylib, .so) -set(TORQUE_LINK_LIBRARIES png_static tinyxml2 collada squish opcode assimp SDL2 glad pcre convexMath zlib) +set(TORQUE_LINK_LIBRARIES collada squish opcode glad convexMath) if(TORQUE_TESTING) set(TORQUE_LINK_LIBRARIES ${TORQUE_LINK_LIBRARIES} gtest gmock)