mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-07-03 13:31:27 +12:00
Compare commits
2 commits
4fd581b812
...
28896acb83
Author | SHA1 | Date | |
---|---|---|---|
|
28896acb83 | ||
|
6f37be1afd |
5 changed files with 9 additions and 1 deletions
|
@ -23,6 +23,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cmake .. \
|
cmake .. \
|
||||||
|
-DCMAKE_PREFIX_PATH=/clang64 \
|
||||||
-DCMAKE_INSTALL_PREFIX=/usr \
|
-DCMAKE_INSTALL_PREFIX=/usr \
|
||||||
-DUSE_NATIVE_INSTRUCTIONS=OFF \
|
-DUSE_NATIVE_INSTRUCTIONS=OFF \
|
||||||
-DUSE_PRECOMPILED_HEADERS=OFF \
|
-DUSE_PRECOMPILED_HEADERS=OFF \
|
||||||
|
@ -44,6 +45,7 @@ cmake .. \
|
||||||
-DOpenGL_GL_PREFERENCE=LEGACY \
|
-DOpenGL_GL_PREFERENCE=LEGACY \
|
||||||
-DWITH_LLVM=ON \
|
-DWITH_LLVM=ON \
|
||||||
-DLLVM_DIR=/clang64/lib/cmake/llvm \
|
-DLLVM_DIR=/clang64/lib/cmake/llvm \
|
||||||
|
-DVulkan_LIBRARY=/clang64/lib/libvulkan.dll.a \
|
||||||
-DSTATIC_LINK_LLVM=ON \
|
-DSTATIC_LINK_LLVM=ON \
|
||||||
-DBUILD_RPCS3_TESTS=OFF \
|
-DBUILD_RPCS3_TESTS=OFF \
|
||||||
-DRUN_RPCS3_TESTS=OFF \
|
-DRUN_RPCS3_TESTS=OFF \
|
||||||
|
|
2
.github/workflows/rpcs3.yml
vendored
2
.github/workflows/rpcs3.yml
vendored
|
@ -361,6 +361,8 @@ jobs:
|
||||||
mingw-w64-clang-x86_64-opencv
|
mingw-w64-clang-x86_64-opencv
|
||||||
mingw-w64-clang-x86_64-glew
|
mingw-w64-clang-x86_64-glew
|
||||||
mingw-w64-clang-x86_64-vulkan
|
mingw-w64-clang-x86_64-vulkan
|
||||||
|
mingw-w64-clang-x86_64-vulkan-headers
|
||||||
|
mingw-w64-clang-x86_64-vulkan-loader
|
||||||
mingw-w64-clang-x86_64-gtest
|
mingw-w64-clang-x86_64-gtest
|
||||||
mingw-w64-clang-x86_64-qt6-base
|
mingw-w64-clang-x86_64-qt6-base
|
||||||
mingw-w64-clang-x86_64-qt6-declarative
|
mingw-w64-clang-x86_64-qt6-declarative
|
||||||
|
|
1
3rdparty/OpenAL/CMakeLists.txt
vendored
1
3rdparty/OpenAL/CMakeLists.txt
vendored
|
@ -11,6 +11,7 @@ if(USE_SYSTEM_OPENAL)
|
||||||
else()
|
else()
|
||||||
option(ALSOFT_UTILS "Build utility programs" OFF)
|
option(ALSOFT_UTILS "Build utility programs" OFF)
|
||||||
option(ALSOFT_EXAMPLES "Build example programs" OFF)
|
option(ALSOFT_EXAMPLES "Build example programs" OFF)
|
||||||
|
set(LIBTYPE "STATIC")
|
||||||
add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
|
add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
|
||||||
add_library(3rdparty_openal INTERFACE)
|
add_library(3rdparty_openal INTERFACE)
|
||||||
target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
|
target_link_libraries(3rdparty_openal INTERFACE OpenAL::OpenAL)
|
||||||
|
|
|
@ -154,7 +154,6 @@ if (NOT ANDROID)
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs)
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs)
|
||||||
elseif(WIN32)
|
elseif(WIN32)
|
||||||
add_custom_command(TARGET rpcs3 POST_BUILD
|
add_custom_command(TARGET rpcs3 POST_BUILD
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:OpenAL::OpenAL> $<TARGET_FILE_DIR:rpcs3>
|
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/Icons $<TARGET_FILE_DIR:rpcs3>/Icons
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/GuiConfigs $<TARGET_FILE_DIR:rpcs3>/GuiConfigs
|
||||||
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test
|
COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/bin/test $<TARGET_FILE_DIR:rpcs3>/test
|
||||||
|
|
|
@ -29,6 +29,10 @@ if(USE_ASAN)
|
||||||
set_source_files_properties(../../Utilities/Thread.cpp PROPERTIES COMPILE_DEFINITIONS USE_ASAN)
|
set_source_files_properties(../../Utilities/Thread.cpp PROPERTIES COMPILE_DEFINITIONS USE_ASAN)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(NOT USE_SYSTEM_OPENAL)
|
||||||
|
target_compile_definitions(rpcs3_emu PUBLIC AL_LIBTYPE_STATIC)
|
||||||
|
endif()
|
||||||
|
|
||||||
if(HAS_MEMORY_BREAKPOINTS)
|
if(HAS_MEMORY_BREAKPOINTS)
|
||||||
target_compile_definitions(rpcs3_emu PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS)
|
target_compile_definitions(rpcs3_emu PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS)
|
||||||
endif()
|
endif()
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue