REF: Renamed kernel -> System; userspace -> Runtime; bootloader -> Boot
del: KSH
This commit is contained in:
+4
-4
@@ -10,7 +10,7 @@ find_program(MCOPY_EXE mcopy)
|
||||
find_program(MKFS_EXE mkfs.fat)
|
||||
find_program(CPIO_EXE cpio)
|
||||
find_program(QEMU_EXE qemu-system-x86_64)
|
||||
set(OVMF_PATH "/usr/share/edk2/ovmf/OVMF_CODE.fd" CACHE FILEPATH "Path to OVMF bios")
|
||||
set(OVMF_PATH "/usr/share/edk2/x64/OVMF.4m.fd" CACHE FILEPATH "Path to OVMF bios")
|
||||
|
||||
execute_process(
|
||||
COMMAND git describe --tags --always --dirty
|
||||
@@ -26,9 +26,9 @@ endif()
|
||||
message(STATUS "Building termOS version: ${KERNEL_VERSION}")
|
||||
add_compile_definitions(TERMOS_VERSION=\"${KERNEL_VERSION}\")
|
||||
|
||||
add_subdirectory(bootloader)
|
||||
add_subdirectory(kernel)
|
||||
add_subdirectory(userspace)
|
||||
add_subdirectory(Boot)
|
||||
add_subdirectory(System)
|
||||
add_subdirectory(Runtime)
|
||||
|
||||
set(SYSTEM_SERVICES
|
||||
init
|
||||
|
||||
@@ -44,7 +44,8 @@ function(add_termos_executable NAME SOURCES)
|
||||
|
||||
target_sources(${NAME} PRIVATE $<TARGET_OBJECTS:RuntimeEntryObject>)
|
||||
|
||||
target_compile_options(${NAME} PRIVATE $<$<COMPILE_LANGUAGE:C>:${USER_C_FLAGS}>)
|
||||
target_compile_options(${NAME} PRIVATE $<$<COMPILE_LANGUAGE:C>:${USER_C_FLAGS}>
|
||||
-fno-stack-protector) # fixme: what the fuck. ugly this works user_c_flags apparently not
|
||||
target_link_libraries(${NAME} PRIVATE term)
|
||||
|
||||
target_link_options(${NAME} PRIVATE
|
||||
@@ -24,7 +24,6 @@ file(GLOB_RECURSE KERNEL_SOURCES CMAKE_CONFIGURE_DEPENDS
|
||||
"src/lib/*.c"
|
||||
"src/IO/*.c"
|
||||
"src/VM/*.c"
|
||||
"src/KSH/*.c"
|
||||
"src/FS/*.c"
|
||||
|
||||
"Data/*.c"
|
||||
@@ -6,4 +6,4 @@
|
||||
#include <types.h>
|
||||
|
||||
Int32 OSLoaderProcessSpawn(const char* executablePath, const char* processName);
|
||||
void init_task_entry();
|
||||
void initTask();
|
||||
@@ -71,7 +71,7 @@ Int32 OSLoaderProcessSpawn(const char* executablePath, const char* processName)
|
||||
return newProcess->processId;
|
||||
}
|
||||
|
||||
void init_task_entry() {
|
||||
void initTask() {
|
||||
Int32 pid = OSLoaderProcessSpawn("/System/CoreServices/init", "init");
|
||||
if (pid < 0) {
|
||||
OSPanic("FATAL: Failed to spawn /System/CoreServices/init");
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user