mirror of
https://github.com/usatiuk/ficus.git
synced 2025-10-29 00:27:52 +01:00
move mutex and cv out
This commit is contained in:
@@ -3,5 +3,6 @@ cmake_minimum_required(VERSION 3.26)
|
||||
project(os2 C CXX ASM_NASM)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
|
||||
add_subdirectory(./src/)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
|
||||
add_executable(kernel)
|
||||
add_executable(kernel.elf)
|
||||
|
||||
add_subdirectory(./arch/)
|
||||
add_subdirectory(./kernel/)
|
||||
|
||||
add_subdirectory(./iso/)
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
|
||||
target_sources(kernel PRIVATE
|
||||
target_sources(kernel.elf PRIVATE
|
||||
limine_mm.c
|
||||
mutex.c
|
||||
task.asm
|
||||
tty.c
|
||||
kmem.c
|
||||
@@ -11,7 +10,6 @@ target_sources(kernel PRIVATE
|
||||
misc.asm
|
||||
limine_fb.c
|
||||
idt.c
|
||||
cv.c
|
||||
serial.c
|
||||
idt.asm
|
||||
globals.c
|
||||
@@ -25,8 +23,8 @@ target_sources(kernel PRIVATE
|
||||
gdt.c
|
||||
misc.c)
|
||||
|
||||
target_include_directories(kernel PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
target_include_directories(kernel.elf PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_link_options(kernel PRIVATE "SHELL:-T${CMAKE_CURRENT_SOURCE_DIR}/linker.ld")
|
||||
set_target_properties(kernel PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/linker.ld")
|
||||
target_link_options(kernel.elf PRIVATE "SHELL:-T${CMAKE_CURRENT_SOURCE_DIR}/linker.ld")
|
||||
set_target_properties(kernel.elf PROPERTIES LINK_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/linker.ld")
|
||||
|
||||
|
||||
@@ -3,11 +3,11 @@ add_custom_target(iso_limine)
|
||||
add_custom_target(iso
|
||||
COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/isodir/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/limine.cfg ${CMAKE_CURRENT_BINARY_DIR}/isodir/
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:kernel> ${CMAKE_CURRENT_BINARY_DIR}/isodir/os2.elf
|
||||
COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:kernel.elf> ${CMAKE_CURRENT_BINARY_DIR}/isodir/os2.elf
|
||||
COMMAND xorriso -as mkisofs -b limine-bios-cd.bin -no-emul-boot -boot-load-size 4 -boot-info-table --efi-boot limine-uefi-cd.bin -efi-boot-part --efi-boot-image --protective-msdos-label ${CMAKE_CURRENT_BINARY_DIR}/isodir -o ${CMAKE_CURRENT_BINARY_DIR}/os2.iso
|
||||
COMMAND ${tools}/limine/prefix/bin/limine bios-install ${CMAKE_CURRENT_BINARY_DIR}/os2.iso
|
||||
VERBATIM
|
||||
DEPENDS kernel
|
||||
DEPENDS kernel.elf
|
||||
DEPENDS iso_limine
|
||||
)
|
||||
|
||||
|
||||
3
src/kernel/CMakeLists.txt
Normal file
3
src/kernel/CMakeLists.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
target_include_directories(kernel.elf PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
|
||||
target_sources(kernel.elf PRIVATE mutex.c cv.c)
|
||||
Reference in New Issue
Block a user