mirror of
https://github.com/obhq/obliteration.git
synced 2024-10-07 00:13:24 +00:00
Moves kernel to top-level (#1012)
This commit is contained in:
parent
4209655fbb
commit
40dd689596
@ -53,7 +53,7 @@ add_custom_target(libgui
|
|||||||
|
|
||||||
add_custom_target(kernel
|
add_custom_target(kernel
|
||||||
COMMAND cargo ${KERNEL_TOOLCHAIN} build $<IF:$<CONFIG:Debug>,--profile=dev,--release> --target ${KERNEL_TARGET} ${KERNEL_OPTS}
|
COMMAND cargo ${KERNEL_TOOLCHAIN} build $<IF:$<CONFIG:Debug>,--profile=dev,--release> --target ${KERNEL_TARGET} ${KERNEL_OPTS}
|
||||||
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/obkrnl
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/kernel
|
||||||
BYPRODUCTS ${KERNEL})
|
BYPRODUCTS ${KERNEL})
|
||||||
|
|
||||||
add_dependencies(libgui kernel)
|
add_dependencies(libgui kernel)
|
||||||
|
@ -2,13 +2,13 @@
|
|||||||
resolver = "2"
|
resolver = "2"
|
||||||
members = [
|
members = [
|
||||||
"gui",
|
"gui",
|
||||||
|
"kernel",
|
||||||
"src/fs",
|
"src/fs",
|
||||||
"src/gmtx",
|
"src/gmtx",
|
||||||
"src/kernel",
|
"src/kernel",
|
||||||
"src/llt",
|
"src/llt",
|
||||||
"src/macros",
|
"src/macros",
|
||||||
"src/obconf",
|
"src/obconf",
|
||||||
"src/obkrnl",
|
|
||||||
"src/param",
|
"src/param",
|
||||||
"src/pfs",
|
"src/pfs",
|
||||||
"src/pkg",
|
"src/pkg",
|
||||||
|
@ -7,7 +7,7 @@ edition = "2021"
|
|||||||
anstyle = { version = "1.0.8", default-features = false }
|
anstyle = { version = "1.0.8", default-features = false }
|
||||||
bitfield-struct = "0.8.0"
|
bitfield-struct = "0.8.0"
|
||||||
hashbrown = "0.14.5"
|
hashbrown = "0.14.5"
|
||||||
macros = { path = "../macros" }
|
macros = { path = "../src/macros" }
|
||||||
obconf = { path = "../obconf", features = ["virt"] }
|
obconf = { path = "../src/obconf", features = ["virt"] }
|
||||||
spin = { version = "0.9.8", features = ["spin_mutex"], default-features = false }
|
spin = { version = "0.9.8", features = ["spin_mutex"], default-features = false }
|
||||||
talc = { version = "4.4.1", default-features = false }
|
talc = { version = "4.4.1", default-features = false }
|
Loading…
Reference in New Issue
Block a user