From 979ef8ebbda6b1f638b09867ee1a0161de4ba21f Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Wed, 26 Dec 2018 10:56:27 -0800 Subject: [PATCH] cmake: fix building without FAudio Only add FAudio to target_link_libraries() if it's enabld. --- src/wx/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt index 5d853bc2..062fc2e8 100644 --- a/src/wx/CMakeLists.txt +++ b/src/wx/CMakeLists.txt @@ -44,8 +44,10 @@ else(ENABLE_OPENAL) ADD_DEFINITIONS (-DNO_OAL) endif(ENABLE_OPENAL) +unset(FAUDIO_LIBS) if(ENABLE_FAUDIO) find_package(FAudio REQUIRED) + set(FAUDIO_LIBS FAudio) endif() IF(CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -601,6 +603,7 @@ ADD_EXECUTABLE ( ${CM_STUFF} ) + TARGET_LINK_LIBRARIES ( visualboyadvance-m ${VBAMCORE_LIBS} @@ -609,7 +612,7 @@ TARGET_LINK_LIBRARIES ( ${DIRECTX_LIBRARIES} ${GTK_LIBRARIES} ${OPENAL_LIBRARY} - FAudio + ${FAUDIO_LIBS} ) if(ENABLE_FFMPEG)