diff --git a/a.out b/a.out deleted file mode 100644 index e69de29..0000000 diff --git a/build.i686 b/build.i686 index e9a31b9..41531a8 100755 --- a/build.i686 +++ b/build.i686 @@ -26,7 +26,7 @@ echo ------------ echo COMPILING OS echo ------------ -make -j24 -s +make TARGET=i686-elf TARGET_DEFINE=__I686 TARGET_ASM=nasm -j24 -s echo --------- echo Finished! diff --git a/src/kernel/Makefile b/src/kernel/Makefile index aa60c54..5454780 100644 --- a/src/kernel/Makefile +++ b/src/kernel/Makefile @@ -27,7 +27,7 @@ SOURCES_ASM_xtensa-esp32-elf = $(wildcard arch/xtensa/*.asm) # TWO ARCHITECTURES! HAHAHAHAH -OBJECTS_ASM = $(patsubst %.asm, $(BUILD_DIR)/kernel/asm/%.obj, $(SOURCES_ASM)) +OBJECTS_ASM = $(patsubst %.asm, $(BUILD_DIR)/kernel/asm/%.obj, $(SOURCES_ASM_$(TARGET))) # i love rejanking this cuz yes (its 4am fuck off) @@ -37,7 +37,7 @@ all: kernel kernel: $(BUILD_DIR)/nanite.bin -$(BUILD_DIR)/nanite.bin: $(OBJECTS_ASM-$(TARGET)) $(OBJECTS_C) +$(BUILD_DIR)/nanite.bin: $(OBJECTS_ASM) $(OBJECTS_C) @$(TARGET_LD) $(TARGET_LINKFLAGS) -Wl,-Map=$(BUILD_DIR)/kernel.map -o $@ $^ $(TARGET_LIBS) @echo "--> Created: nanite.bin" @@ -46,7 +46,7 @@ $(BUILD_DIR)/kernel/c/%.obj: %.c $(HEADERS_C) @$(TARGET_CC) $(TARGET_CFLAGS) -c -o $@ $< @echo "--> Compiled: " $< -$(BUILD_DIR)/kernel/asm/%.obj: %.asm $(HEADERS_ASM-$(TARGET)) +$(BUILD_DIR)/kernel/asm/%.obj: %.asm $(HEADERS_ASM_$(TARGET)) @mkdir -p $(@D) @$(TARGET_ASM) $(TARGET_ASMFLAGS) -o $@ $< @echo "--> Compiled: " $< diff --git a/src/kernel/main.c b/src/kernel/main.c index 7f5874c..7616fce 100644 --- a/src/kernel/main.c +++ b/src/kernel/main.c @@ -67,7 +67,14 @@ void start(unsigned long magic, unsigned long address) { // Print logo clrscr(); printf("%s", LOGO); - printf("The Nano OS %s\n-------------------------------------\n", VERSION); + #ifdef __I686 + printf("[i686]\n"); + #endif + #ifdef __XTENSA + printf("[Xtensa]\n"); + #endif + + printf("The Nano OS %s\n--------------------------------------------\n", VERSION); // Multiboot Debug Stuff // if (magic != MULTIBOOT2_BOOTLOADER_MAGIC) { diff --git a/src/kernel/version.h b/src/kernel/version.h index ea80392..c0236c3 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -5,7 +5,7 @@ \*----------------*/ #pragma once -#define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/ \n" // Nanite's Logo as a formatted string -#define VERSION "RD-00055" // Current Version of Nanite +#define LOGO " _ _____ _ __________________\n / | / / | / | / / _/_ __/ ____/\n / |/ / /| | / |/ // / / / / __/ \n / /| / ___ |/ /| // / / / / /___ \n/_/ |_/_/ |_/_/ |_/___/ /_/ /_____/" // Nanite's Logo as a formatted string +#define VERSION "RD-00056" // Current Version of Nanite #define BOOTLOGO " _ ______ ____ ____ ______\n / | / / __ )/ __ \\/ __ /_ __/\n / |/ / __ / / / / / / // / \n / /| / /_/ / /_/ / /_/ // / \n/_/ |_/_____/\\____/\\____//_/ \n" // Old bootloader logo // one day i will re-implement NBOOT V 2