From 566c88802ee1968fbe0a17b14708445a4e2f7e11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lassi=20H=C3=A4m=C3=A4l=C3=A4inen?= Date: Tue, 18 Sep 2018 18:06:49 +0300 Subject: [PATCH] CMake: LLVM, Pulse, Alsa and libevdev being disabled - These dependencies have #defines which enable code related to them in rpcs3 and rpcs3_ui targets. They are only used in rpcs3_emu but HAVE_* defines have to be defined in rpcs3 and rpcs3_ui targets also, so they have to have PUBLIC visibility so defines carried over CMake: Fix Alsa and Pulse audios being disabled - HAVE_PULSE and HAVE_ALSA were not defined in rpcs3 target Fixup libevdev --- rpcs3/Emu/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/CMakeLists.txt b/rpcs3/Emu/CMakeLists.txt index 013a0b75ff..8c9997b801 100644 --- a/rpcs3/Emu/CMakeLists.txt +++ b/rpcs3/Emu/CMakeLists.txt @@ -4,7 +4,9 @@ add_library(rpcs3_emu ${SRC_FILES}) target_link_libraries(rpcs3_emu PRIVATE - 3rdparty::zlib 3rdparty::yaml-cpp) + 3rdparty::zlib 3rdparty::yaml-cpp + PUBLIC + 3rdparty::libevdev) # For stdafx.h target_include_directories(rpcs3_emu @@ -45,7 +47,7 @@ if(WIN32) endif() target_link_libraries(rpcs3_emu - PRIVATE + PUBLIC 3rdparty::alsa 3rdparty::pulse 3rdparty::openal) @@ -71,7 +73,7 @@ file(GLOB_RECURSE CPU_SRC_FILES "CPU/*.cpp") target_sources(rpcs3_emu PRIVATE ${CPU_SRC_FILES}) target_link_libraries(rpcs3_emu - PRIVATE 3rdparty::llvm 3rdparty::asmjit) + PUBLIC 3rdparty::llvm 3rdparty::asmjit) # Io