From 04bf7b9e3b0052d2ab2cd8321d4b7b8c0b576424 Mon Sep 17 00:00:00 2001 From: Enrico Fraccaroli Date: Tue, 9 Nov 2021 16:13:10 +0100 Subject: [PATCH] Move boot.S inside the src folder. Move the buddy system library inside the src/mem folder. --- mentos/CMakeLists.txt | 5 +++-- mentos/{ => src}/boot.S | 0 .../mem/libbuddysystem.a} | Bin 3 files changed, 3 insertions(+), 2 deletions(-) rename mentos/{ => src}/boot.S (100%) rename mentos/{libmentos_memory.a => src/mem/libbuddysystem.a} (100%) diff --git a/mentos/CMakeLists.txt b/mentos/CMakeLists.txt index 3dd47a5..8be90ca 100644 --- a/mentos/CMakeLists.txt +++ b/mentos/CMakeLists.txt @@ -9,7 +9,7 @@ project(mentos C ASM) set(KERNEL_NAME ${PROJECT_NAME}_kernel) set(BOOTLOADER_NAME ${PROJECT_NAME}_bootloader) set(BUDDY_SYSTEM_NAME ${PROJECT_NAME}_memory) -set(BUDDY_SYSTEM_FILE ${PROJECT_SOURCE_DIR}/lib${PROJECT_NAME}_memory.a) +set(BUDDY_SYSTEM_FILE ${PROJECT_SOURCE_DIR}/src/mem/libbuddysystem.a) # ============================================================================= # Set the default build type to Debug. @@ -306,9 +306,10 @@ else(USE_BUDDY_SYSTEM) # Link the exercise libraries. target_link_libraries(${KERNEL_NAME} ${BUDDY_SYSTEM_FILE}) endif(USE_BUDDY_SYSTEM) + # ============================================================================= # Add bootloader library. -add_library(${BOOTLOADER_NAME} src/boot.c boot.S) +add_library(${BOOTLOADER_NAME} src/boot.c src/boot.S) # ============================================================================= # Build the kernel. diff --git a/mentos/boot.S b/mentos/src/boot.S similarity index 100% rename from mentos/boot.S rename to mentos/src/boot.S diff --git a/mentos/libmentos_memory.a b/mentos/src/mem/libbuddysystem.a similarity index 100% rename from mentos/libmentos_memory.a rename to mentos/src/mem/libbuddysystem.a