diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index 47368c5071..ee35dc1e52 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -173,6 +173,16 @@ RPCS3_SRC "${RPCS3_SRC_DIR}/../rsx_program_decompiler/shader_code/*" ) +if(APPLE) + set (EXCLUDE_DIR "/RSX/VK/") + foreach (TMP_PATH ${RPCS3_SRC}) + string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND) + if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1) + list (REMOVE_ITEM RPCS3_SRC ${TMP_PATH}) + endif () + endforeach(TMP_PATH) +endif() + add_executable(rpcs3 ${RPCS3_SRC}) @@ -195,13 +205,18 @@ if(WIN32) # I'm not sure we need all of these libs, but we link them in vs else() if(LLVM_FOUND) target_link_libraries(rpcs3 asmjit.a ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) - target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a png16_static ${ZLIB_LIBRARIES} ${LLVM_LIBS} ${ADDITIONAL_LIBS} vulkan glslang OSDependent OGLCompiler SPIRV) + target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a png16_static ${ZLIB_LIBRARIES} ${LLVM_LIBS} ${ADDITIONAL_LIBS}) + if (NOT APPLE) + target_link_libraries(rpcs3 vulkan glslang OSDependent OGLCompiler SPIRV) + endif() else() target_link_libraries(rpcs3 asmjit.a ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES}) - target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a png16_static ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS} vulkan glslang OSDependent OGLCompiler SPIRV) + target_link_libraries(rpcs3 libavformat.a libavcodec.a libavutil.a libswresample.a libswscale.a png16_static ${ZLIB_LIBRARIES} ${ADDITIONAL_LIBS}) + if (NOT APPLE) + target_link_libraries(rpcs3 vulkan glslang OSDependent OGLCompiler SPIRV) + endif() endif() endif() set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SRC_DIR}/stdafx.h") -cotire(rpcs3) - +cotire(rpcs3) \ No newline at end of file diff --git a/rpcs3/rpcs3.cpp b/rpcs3/rpcs3.cpp index 92ae1d3b03..4ced904402 100644 --- a/rpcs3/rpcs3.cpp +++ b/rpcs3/rpcs3.cpp @@ -32,10 +32,10 @@ #include "Emu/RSX/Null/NullGSRender.h" #include "Emu/RSX/GL/GLGSRender.h" -#include "Emu/RSX/VK/VKGSRender.h" #include "Emu/Audio/Null/NullAudioThread.h" #include "Emu/Audio/AL/OpenALThread.h" #ifdef _MSC_VER +#include "Emu/RSX/VK/VKGSRender.h" #include "Emu/RSX/D3D12/D3D12GSRender.h" #include "Emu/Audio/XAudio2/XAudio2Thread.h" #endif