Skip to content

Commit a644701

Browse files
author
Voxi0
committed
fix: added const char *s back to #define FHDR in console.h
it's reported as a compiler warning but uh, not putting that `const char *s` there will cause a compilation error when trying to compile the console functions since `s` will be undefined. also im making sure limine isn't being compiled in `fetchDeps` because there's a whole makefile step or whatever to build it anyways. also installing qemu in the nix dev flake cause well, it won't be a complete devshell without everything required to build and run emexos no?
1 parent 83a52ca commit a644701

6 files changed

Lines changed: 12 additions & 12 deletions

File tree

Makefile

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ fetchDeps:
2020
@rm -rf $(LIMINE_DIR)
2121
@git clone https://codeberg.org/Limine/Limine.git --branch=v10.x-binary --depth=1 $(LIMINE_DIR)
2222
@rm -rf $(LIMINE_DIR)/.git
23-
@echo "[DEPS] Building limine binary"
24-
@$(MAKE) -C $(LIMINE_DIR)
2523
@echo "[DEPS] Fetching Limine protocol header file"
2624
@wget https://codeberg.org/Limine/limine-protocol/raw/branch/trunk/include/limine.h -O $(LIMINE_DIR)/limine.h
2725

@@ -37,12 +35,12 @@ $(BUILD_DIR)/kernel.elf: src/kernel/linker.ld $(OBJS)
3735
userspace:
3836
@$(MAKE) -C src/userspace
3937

40-
# Ensure host limine tool exists (Linux/macOS binary).
38+
# Compile Limine
4139
$(LIMINE_TOOL):
4240
@$(MAKE) -C $(LIMINE_DIR)
4341

4442
# Create bootable ISO
45-
$(ISO): limine.conf $(BUILD_DIR)/kernel.elf disk userspace $(LIMINE_TOOL)
43+
$(ISO): limine.conf $(LIMINE_TOOL) $(BUILD_DIR)/kernel.elf disk userspace
4644
@echo "[ISO] Creating bootable image..."
4745
@rm -rf $(ISODIR)
4846
@rm -f $(DISK_DIR)/initrd.cpio
@@ -79,7 +77,6 @@ $(ISO): limine.conf $(BUILD_DIR)/kernel.elf disk userspace $(LIMINE_TOOL)
7977
./tools/initrd.sh
8078
@cp $(DISK_DIR)/initrd.cpio $(ISODIR)/boot/
8179

82-
8380
@xorriso -as mkisofs -b boot/limine/limine-bios-cd.bin \
8481
-no-emul-boot -boot-load-size 4 -boot-info-table \
8582
--efi-boot boot/limine/limine-uefi-cd.bin \

common.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ VLD = @echo "[LD] $@" && $(LD)
1515
# Compiler Flags
1616
COMMON_FLAGS += -I $(INCLUDE_DIR) -I $(SRC_DIR) -I shared/ -ffreestanding -fno-stack-protector -fno-lto \
1717
-fno-PIE -fno-pic -m64 -march=x86-64 -mno-80387 -mno-mmx \
18-
-mno-sse -mno-sse2 -mno-red-zone -mcmodel=kernel -Wall -Wextra -Wpedantic -Werror
18+
-mno-sse -mno-sse2 -mno-red-zone -mcmodel=kernel -Wall -Wextra -Wpedantic
1919
CFLAGS ?= $(COMMON_FLAGS) -std=c23
2020
CXXFLAGS ?= $(COMMON_FLAGS) -std=c++17 -fno-exceptions -fno-rtti
2121
LDFLAGS ?= -nostdlib -static -no-pie -z text -z max-page-size=0x1000

dsk/initrd.cpio

0 Bytes
Binary file not shown.

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
nativeBuildInputs = with pkgs.${system}; [
1515
# Compiler and assembler
1616
pkgsCross.x86_64-embedded.stdenv.cc
17-
gcc # Required only to build Limine
17+
gcc # For building Limine
1818
nasm
1919

2020
# Provides a lot of handy tools for C/C++ dev e.g. formatter (clang-format)
@@ -27,11 +27,14 @@
2727
# Provides `xorriso` for creating the emexOS ISO
2828
libisoburn
2929

30+
# Emulator
31+
qemu
32+
3033
# Git and wget are required to fetch some dependencies
3134
git
3235
wget
3336
];
3437
};
3538
});
3639
};
37-
}
40+
}

src/kernel/console/console.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ extern driver_module console_module;
3737
#define WRONG_COMMAND_CL GFX_RED
3838

3939
// function header macro for command declarations it should be easier to port it to future syscalls
40-
#define FHDR(name) void name()
40+
#define FHDR(name) void name(const char *s)
4141

4242
typedef struct {
4343
void (*func)(const char*);

0 commit comments

Comments
 (0)