mirror of
https://github.com/RPCS3/rpcs3.git
synced 2026-04-04 22:18:53 +00:00
Fix submodule errors
This commit is contained in:
parent
d1e7fe4da0
commit
e65b63308f
15 changed files with 85 additions and 64 deletions
2
3rdparty/OpenAL/openal-soft
vendored
2
3rdparty/OpenAL/openal-soft
vendored
|
|
@ -1 +1 @@
|
|||
Subproject commit 9c50193236ad4d8c68f390a3151f8253709baabd
|
||||
Subproject commit 0e5e98e4ac8adae92e4f7653dd6eee17aa9c8791
|
||||
1
3rdparty/asmjit/CMakeLists.txt
vendored
1
3rdparty/asmjit/CMakeLists.txt
vendored
|
|
@ -11,6 +11,7 @@ include("${ASMJIT_DIR}/CMakeLists.txt")
|
|||
add_library(asmjit ${ASMJIT_SRC})
|
||||
target_include_directories(asmjit PUBLIC ${ASMJIT_DIR}/src)
|
||||
target_link_libraries(asmjit PRIVATE ${ASMJIT_DEPS})
|
||||
target_compile_options(asmjit PRIVATE -Wno-nontrivial-memcall -Wno-deprecated-anon-enum-enum-conversion)
|
||||
|
||||
# ASMJIT should have a option for disabling installing and this wouldnt
|
||||
# be required to avoid installing ASMJIT...
|
||||
|
|
|
|||
5
3rdparty/cubeb/CMakeLists.txt
vendored
5
3rdparty/cubeb/CMakeLists.txt
vendored
|
|
@ -10,6 +10,11 @@ set(USE_SANITIZERS FALSE CACHE BOOL "Dont't use sanitizers")
|
|||
|
||||
add_subdirectory(cubeb EXCLUDE_FROM_ALL)
|
||||
add_library(3rdparty::cubeb ALIAS cubeb)
|
||||
target_compile_options(cubeb PRIVATE
|
||||
-Wno-int-to-void-pointer-cast
|
||||
-Wno-deprecated-declarations
|
||||
-Wno-implicit-const-int-float-conversion
|
||||
)
|
||||
|
||||
if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm|ARM|aarch64|AArch64|Aarch64)")
|
||||
target_compile_definitions(speex PUBLIC
|
||||
|
|
|
|||
7
3rdparty/libusb/config.cmake
vendored
7
3rdparty/libusb/config.cmake
vendored
|
|
@ -33,6 +33,13 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
|
|||
)
|
||||
elseif(MSVC)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
|
||||
append_compiler_flags(
|
||||
-Wno-unused-value
|
||||
-Wno-pragma-pack
|
||||
${ADDITIONAL_CC_FLAGS}
|
||||
)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
check_include_files(sys/timerfd.h USBI_TIMERFD_AVAILABLE)
|
||||
|
|
|
|||
1
3rdparty/yaml-cpp/CMakeLists.txt
vendored
1
3rdparty/yaml-cpp/CMakeLists.txt
vendored
|
|
@ -12,5 +12,6 @@ set(YAML_CPP_BUILD_TESTS OFF CACHE BOOL "Enable testing" FORCE)
|
|||
set(YAML_CPP_BUILD_TOOLS OFF CACHE BOOL "Enable parse tools" FORCE)
|
||||
set(YAML_CPP_BUILD_CONTRIB OFF CACHE BOOL "Enable contrib stuff in library" FORCE)
|
||||
add_subdirectory(yaml-cpp EXCLUDE_FROM_ALL)
|
||||
target_compile_options(yaml-cpp PRIVATE -Wno-ignored-attributes -Wno-unused-value)
|
||||
|
||||
set(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX_OLD})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue