refactor #1

Merged
DragonSpirit merged 10 commits from refactor into main 2026-05-14 23:34:13 +03:00
5 changed files with 10 additions and 10 deletions
Showing only changes of commit 9b18a32b0c - Show all commits
-1
View File
@@ -2,7 +2,6 @@
* text=auto eol=lf
# Vendor: do not count toward language stats
lib/Plutonium/** linguist-vendored=true
deps/** linguist-vendored=true
# Binary assets
+1
View File
@@ -49,3 +49,4 @@ CMakeCache.txt
CMakeFiles/
cmake_install.cmake
compile_commands.json
.cache/
-3
View File
@@ -1,3 +0,0 @@
[submodule "lib"]
path = lib
url = https://github.com/XorTroll/Plutonium.git
+9 -5
View File
@@ -52,12 +52,16 @@ target_include_directories(NXST PRIVATE ${PORTLIBS_INCLUDE_DIRS})
# ── Plutonium ─────────────────────────────────────────────────────────────────
include(ExternalProject)
set(LIBPU_A ${CMAKE_SOURCE_DIR}/lib/Plutonium/lib/libpu.a)
set(PLUTONIUM_SOURCE_DIR ${CMAKE_BINARY_DIR}/plutonium)
set(LIBPU_A ${PLUTONIUM_SOURCE_DIR}/Plutonium/lib/libpu.a)
ExternalProject_Add(plutonium_ep
SOURCE_DIR ${CMAKE_SOURCE_DIR}/lib/Plutonium
GIT_REPOSITORY https://github.com/XorTroll/Plutonium.git
GIT_TAG b56564b70d038c59eef875f2c3cf436859c827f2
GIT_PROGRESS ON
SOURCE_DIR ${PLUTONIUM_SOURCE_DIR}
CONFIGURE_COMMAND ""
BUILD_COMMAND make -j -C ${CMAKE_SOURCE_DIR}/lib/Plutonium
BUILD_COMMAND make -j -C ${PLUTONIUM_SOURCE_DIR}/Plutonium
INSTALL_COMMAND ""
BUILD_IN_SOURCE 1
BUILD_BYPRODUCTS ${LIBPU_A}
@@ -66,9 +70,9 @@ ExternalProject_Add(plutonium_ep
add_library(plutonium STATIC IMPORTED GLOBAL)
add_dependencies(plutonium plutonium_ep)
set_target_properties(plutonium PROPERTIES
IMPORTED_LOCATION ${LIBPU_A}
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_SOURCE_DIR}/lib/Plutonium/include
IMPORTED_LOCATION ${LIBPU_A}
)
target_include_directories(NXST PRIVATE ${PLUTONIUM_SOURCE_DIR}/Plutonium/include)
# ── Link libraries ────────────────────────────────────────────────────────────
# Order matters for static linking: put most dependent libs first.
Submodule lib deleted from b56564b70d