ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Lassi Hämäläinen 2018-09-18 18:06:49 +03:00 committed by Ivan
parent d6dc1493cb
commit 566c88802e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/CMakeLists.txt
View File

@ -4,7 +4,9 @@ add_library(rpcs3_emu ${SRC_FILES})
target_link_libraries(rpcs3_emu target_link_libraries(rpcs3_emu
PRIVATE PRIVATE
3rdparty::zlib 3rdparty::yaml-cpp) 3rdparty::zlib 3rdparty::yaml-cpp
PUBLIC
3rdparty::libevdev)
# For stdafx.h # For stdafx.h
target_include_directories(rpcs3_emu target_include_directories(rpcs3_emu
@ -45,7 +47,7 @@ if(WIN32)
endif() endif()
target_link_libraries(rpcs3_emu target_link_libraries(rpcs3_emu
PRIVATE PUBLIC
3rdparty::alsa 3rdparty::pulse 3rdparty::openal) 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_sources(rpcs3_emu PRIVATE ${CPU_SRC_FILES})
target_link_libraries(rpcs3_emu target_link_libraries(rpcs3_emu
PRIVATE 3rdparty::llvm 3rdparty::asmjit) PUBLIC 3rdparty::llvm 3rdparty::asmjit)
# Io # Io