RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-10 18:50:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

add xed submodule, relicense with GPLv2+ to fix license incompatibility with 3rdparty libs

Browse source
This commit is contained in:
DH 2025-12-28 19:08:02 +03:00
parent 5f21ddb6f7
commit cd46eaabd5
5 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.github/readme.md vendored
View file

@ -26,8 +26,7 @@ If you want to contribute as a developer, please contact us in the [Discord](htt
## License
RPCSX is licensed under GPLv2 license except directories containing their own LICENSE file, or files containing their own license.
Thus, orbis-kernel is licensed under the MIT license.
RPCSX is licensed under GPLv2-or-later license except directories containing their own LICENSE file, or files containing their own license.
## RPCS3

6
.gitmodules vendored
View file

@ -140,3 +140,9 @@
[submodule "3rdparty/glfw"]
path = 3rdparty/glfw
url = ../../glfw/glfw.git
[submodule "3rdparty/xed"]
path = 3rdparty/xed
url = https://github.com/intelxed/xed.git
[submodule "3rdparty/mbuild"]
path = 3rdparty/mbuild
url = https://github.com/intelxed/mbuild.git

21
3rdparty/CMakeLists.txt vendored
View file

@ -457,6 +457,27 @@ else()
add_library(3rdparty::glfw ALIAS glfw)
endif()
find_package(Python3 REQUIRED COMPONENTS Interpreter)
set(XED_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/xed)
set(XED_BIN_PATH ${CMAKE_CURRENT_BINARY_DIR}/xed)
make_directory(${XED_BIN_PATH}/obj)
if (${CMAKE_CROSSCOMPILING})
set(XED_FLAGS --extra-flags="--target=${CMAKE_C_COMPILER_TARGET}" --extra-linkflags="--target=${CMAKE_C_COMPILER_TARGET}")
endif()
add_custom_command(
OUTPUT "${XED_BIN_PATH}/obj/libxed.a"
COMMAND "${Python3_EXECUTABLE}" "${XED_SRC_PATH}/mfile.py" "--cc=${CMAKE_C_COMPILER}" "--cxx=${CMAKE_CXX_COMPILER}" "--linker=${CMAKE_CXX_COMPILER}" ${XED_FLAGS}
COMMENT "Building xed..."
WORKING_DIRECTORY ${XED_BIN_PATH}
)
add_custom_target(xed-build DEPENDS "${XED_BIN_PATH}/obj/libxed.a")
add_library(xed STATIC IMPORTED GLOBAL)
set_property(TARGET xed PROPERTY IMPORTED_LOCATION "${XED_BIN_PATH}/obj/libxed.a")
set_property(TARGET xed PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${XED_SRC_PATH}/include/public/xed/" "${XED_BIN_PATH}/obj")
add_dependencies(xed xed-build)
add_library(3rdparty::zlib ALIAS 3rdparty_zlib)
add_library(3rdparty::zstd ALIAS 3rdparty_zstd)

1
3rdparty/mbuild vendored Submodule

@ -0,0 +1 @@
Subproject commit c40618acd549e6ae2569a84eaf0407f64dc7b6b2

1
3rdparty/xed vendored Submodule

@ -0,0 +1 @@
Subproject commit 95ca7183f6e27834f9bfad7095eefa057f09a88b