From d0e2f12d76443eaaa66d223dc645629f372668da Mon Sep 17 00:00:00 2001 From: Xycaleth Date: Sun, 10 Aug 2014 20:47:39 +0100 Subject: [PATCH] Fix CMakeLists for client binary JKG keeps the OpenAL32.lib library in a slightly different place from where OpenJK keeps it. --- codemp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codemp/CMakeLists.txt b/codemp/CMakeLists.txt index 83005d9477..d94dec7d28 100644 --- a/codemp/CMakeLists.txt +++ b/codemp/CMakeLists.txt @@ -354,11 +354,11 @@ if(BuildMPEngine) set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} "${MPDir}/client/OpenAL") # There's a libs/OpenAL32.lib # (mrw) TODO Is this actually required on windows? It is loaded at runtime, should not be linked? - find_library(OpenALLibrary NAMES OpenAL32 PATHS ${OpenJKLibDir}) + find_library(OpenALLibrary NAMES OpenAL32 PATHS ${OpenJKLibDir}/openal) if(NOT OpenALLibrary) message(FATAL_ERROR "UseInternalOpenAL enabled, but lib/OpenAL32.lib not found!") endif(NOT OpenALLibrary) - set(MPEngineLibraries ${MPEngineLibraries} ${OpenALLibrary}) + set(MPEngineLibraries ${MPEngineLibraries} ${OpenALLibrary}/openal) else(UseInternalOpenAL) find_package(OpenAL REQUIRED) set(MPEngineIncludeDirectories ${MPEngineIncludeDirectories} ${OPENAL_INCLUDE_DIR})