thirdpartymirrors/N64ModernRuntime
1
0
Fork 0
mirror of https://github.com/N64Recomp/N64ModernRuntime.git synced 2025-10-30 08:02:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake fixes to allow building this repo as a submodule (#25)

Browse source
This commit is contained in:
Anghelo Carvajal 2024-05-30 03:16:07 -04:00 • committed by GitHub
parent 3ddeb07d85
commit 6dce8c2fc2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -7,6 +7,3 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
add_subdirectory(ultramodern)
add_subdirectory(librecomp)
set(RT64_STATIC TRUE)
add_subdirectory(rt64)

6
librecomp/CMakeLists.txt
View file

@ -31,11 +31,11 @@ add_library(librecomp STATIC
target_include_directories(librecomp PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include"
"${CMAKE_SOURCE_DIR}/ultramodern/include"
"${CMAKE_SOURCE_DIR}/thirdparty/concurrentqueue"
"${PROJECT_SOURCE_DIR}/../ultramodern/include"
"${PROJECT_SOURCE_DIR}/../thirdparty/concurrentqueue"
)
target_include_directories(librecomp PRIVATE
"${CMAKE_SOURCE_DIR}/rt64/src/contrib"
"${PROJECT_SOURCE_DIR}/../rt64/src/contrib"
)
target_compile_options(librecomp PRIVATE -Wno-deprecated-declarations)

18
ultramodern/CMakeLists.txt
View file

@ -24,8 +24,8 @@ add_library(ultramodern STATIC
target_include_directories(ultramodern PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include/"
"${CMAKE_SOURCE_DIR}/thirdparty/concurrentqueue"
"${CMAKE_SOURCE_DIR}/thirdparty/sse2neon"
"${PROJECT_SOURCE_DIR}/../thirdparty/concurrentqueue"
"${PROJECT_SOURCE_DIR}/../thirdparty/sse2neon"
)
target_include_directories(ultramodern PRIVATE
@ -34,13 +34,13 @@ target_include_directories(ultramodern PRIVATE
# TODO: remove when rt64 is no longer a hard dependency
target_include_directories(ultramodern PRIVATE
"${CMAKE_SOURCE_DIR}/rt64/src"
"${CMAKE_SOURCE_DIR}/rt64/src/contrib"
"${CMAKE_SOURCE_DIR}/rt64/src/contrib/hlslpp/include"
"${CMAKE_SOURCE_DIR}/rt64/src/contrib/dxc/inc"
"${CMAKE_SOURCE_DIR}/rt64/src/rhi"
"${CMAKE_SOURCE_DIR}/rt64/src/render"
"${CMAKE_SOURCE_DIR}/rt64/src/contrib/nativefiledialog-extended/src/include"
"${PROJECT_SOURCE_DIR}/../rt64/src"
"${PROJECT_SOURCE_DIR}/../rt64/src/contrib"
"${PROJECT_SOURCE_DIR}/../rt64/src/contrib/hlslpp/include"
"${PROJECT_SOURCE_DIR}/../rt64/src/contrib/dxc/inc"
"${PROJECT_SOURCE_DIR}/../rt64/src/rhi"
"${PROJECT_SOURCE_DIR}/../rt64/src/render"
"${PROJECT_SOURCE_DIR}/../rt64/src/contrib/nativefiledialog-extended/src/include"
)
# TODO: remove when librecomp is untangled from ultramodern