From 46267f52d6185d87f68f27b59bacef7ef2d403df Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 6 Feb 2016 10:58:25 +0200 Subject: [PATCH 1/2] Fixed build with OpenAL on non-Windows systems We still need to link with OpenAL library on OSes other than Windows --- src/CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bff1a36e3..e6c94f05b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -217,8 +217,14 @@ endif() if( NOT NO_OPENAL ) find_package( OpenAL ) mark_as_advanced(CLEAR OPENAL_INCLUDE_DIR) + if( NOT WIN32 ) + mark_as_advanced(CLEAR OPENAL_LIBRARY) + endif() if( OPENAL_FOUND ) include_directories( ${OPENAL_INCLUDE_DIR} ) + if( NOT WIN32 ) + set( ZDOOM_LIBS ${OPENAL_LIBRARY} ${ZDOOM_LIBS} ) + endif() else() set( NO_OPENAL ON ) endif() From 1101546e9c434630ced52a8189e55ced92f2e9d2 Mon Sep 17 00:00:00 2001 From: Braden Obrzut Date: Sat, 6 Feb 2016 13:05:41 -0500 Subject: [PATCH 2/2] - Fixed: Possible CMake wrong number of parameters configuration error. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bff1a36e3..add2b3f6a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1246,10 +1246,10 @@ if( MSVC ) option( ZDOOM_GENERATE_MAPFILE "Generate .map file for debugging." OFF ) set( LINKERSTUFF "/MANIFEST:NO /DELAYLOAD:\"fmodex${X64}.dll\"" ) if( ZDOOM_GENERATE_MAPFILE ) - set( LINKERSTUFF ${LINKERSTUFF} "/MAP" ) + set( LINKERSTUFF "${LINKERSTUFF} /MAP" ) endif() if( NOT NO_OPENAL ) - set( LINKERSTUFF ${LINKERSTUFF} "/DELAYLOAD:\"libmpg123-0.dll\" /DELAYLOAD:\"libsndfile-1.dll\"" ) + set( LINKERSTUFF "${LINKERSTUFF} /DELAYLOAD:\"libmpg123-0.dll\" /DELAYLOAD:\"libsndfile-1.dll\"" ) endif() set_target_properties(zdoom PROPERTIES LINK_FLAGS ${LINKERSTUFF})