The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-02-16 21:29:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Swap out boostorg/boost for skyline-emu/boost

Browse Source
This commit is contained in:
lynxnb 2022-04-04 14:56:06 +02:00 committed by PixelyIon
parent b45437b78b
commit 69ba4f8abb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -36,7 +36,7 @@
url = https://github.com/xiph/opus url = https://github.com/xiph/opus
[submodule "Boost"] [submodule "Boost"]
path = app/libraries/boost path = app/libraries/boost
url = https://github.com/boostorg/boost.git url = https://github.com/skyline-emu/boost.git
ignore = all ignore = all
[submodule "LLVM"] [submodule "LLVM"]
path = app/libraries/llvm path = app/libraries/llvm

10
app/CMakeLists.txt
View File

@ -38,6 +38,11 @@ set(LIBCXXABI_LIBCXX_INCLUDES "${LIBCXX_TARGET_INCLUDE_DIRECTORY}" CACHE STRING
add_subdirectory("libraries/llvm/libcxxabi") add_subdirectory("libraries/llvm/libcxxabi")
link_libraries(cxxabi_static) link_libraries(cxxabi_static)
# Skyline's Boost fork
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
add_subdirectory("libraries/boost")
# {fmt} # {fmt}
add_subdirectory("libraries/fmt") add_subdirectory("libraries/fmt")
@ -94,11 +99,6 @@ include_directories(SYSTEM "libraries/perfetto/sdk")
add_library(perfetto STATIC libraries/perfetto/sdk/perfetto.cc) add_library(perfetto STATIC libraries/perfetto/sdk/perfetto.cc)
target_compile_options(perfetto PRIVATE -Wno-everything) target_compile_options(perfetto PRIVATE -Wno-everything)
# Boost
set(Boost_USE_STATIC_LIBS ON)
set(Boost_USE_MULTITHREADED ON)
add_subdirectory("libraries/boost")
# C++ Range v3 # C++ Range v3
add_subdirectory("libraries/range") add_subdirectory("libraries/range")

2
app/build.gradle
View File

@ -64,7 +64,7 @@ android {
disable 'IconLocation' disable 'IconLocation'
} }
/* NDK */ /* NDK and CMake */
ndkVersion '25.0.8221429' ndkVersion '25.0.8221429'
externalNativeBuild { externalNativeBuild {
cmake { cmake {

2
app/libraries/boost

@ -1 +1 @@
Subproject commit e32407f2b4cac7f0d739f10821d7f7e0c81e8436 Subproject commit 06d52af216340ed46b865d01c4f7c0d7a8cc5918