diff --git a/Makefile b/Makefile index 712112a9..bac25838 100644 --- a/Makefile +++ b/Makefile @@ -87,10 +87,11 @@ INITRD_OBJS = $(patsubst $(INITRD_SRC)/src/%.c, $(INITRD_OBJ)/%.o, $(INITRD_SRCS # Targets -# all - builds a proper kernel.elf file for release +# rel - builds a proper kernel.elf file for release # dbg - builds a kernel file (non-binary) for use with objdump or other examination tools (this target is most commonly used while testing new linking) -all: $(OUT_KERNEL)/kernel.elf $(OUT_INITRD)/initrd.img +all: rel +rel: $(OUT_KERNEL)/kernel.elf $(OUT_INITRD)/initrd.img dbg: $(OUT_KERNEL)/kernel_debug.elf $(OUT_INITRD)/initrd.img diff --git a/README.md b/README.md index cd0f8d44..42d5a36c 100644 --- a/README.md +++ b/README.md @@ -28,10 +28,10 @@ Usermode and ELF loading **To build reduceOS, you need these packages:** `gcc`, `nasm`, `make`, `grub`\ **To run reduceOS, you need these packages:** `qemu-system` (emulation), or `grub-common` and `xorriso` (for building an ISO - does not work in QEMU!) -The makefile of reduceOS has two main targets for building - `all` and `dbg`.\ -The target to actually build the OS is `all`. If you need to do further debugging, use `dbg` (outputs debug symbols) +The makefile of reduceOS has two main targets for building - `rel` and `dbg`.\ +The target to actually build the OS is `rel`. If you need to do further debugging, use `dbg` (outputs debug symbols) -Run `make` to build the OS, or `make all dbg` if you're trying to debug it. +Run `make rel` to build the OS in a release configuration, or `make dbg` if you're trying to debug it. Finally, you need to launch the OS. This can be done in a variety of different ways, but the Makefile uses QEMU.\ Run `make qemu` to launch QEMU and start the OS. diff --git a/obj/kernel.o b/obj/kernel.o index 5b3e4981..7d4d0047 100644 Binary files a/obj/kernel.o and b/obj/kernel.o differ diff --git a/obj/vmm.o b/obj/vmm.o index aefd1b08..511cad53 100644 Binary files a/obj/vmm.o and b/obj/vmm.o differ diff --git a/out/kernel/kernel.elf b/out/kernel/kernel.elf index 478827b7..df849170 100755 Binary files a/out/kernel/kernel.elf and b/out/kernel/kernel.elf differ diff --git a/source/kernel/include/CONFIG.h b/source/kernel/include/CONFIG.h index 35778a4a..d7236726 100644 --- a/source/kernel/include/CONFIG.h +++ b/source/kernel/include/CONFIG.h @@ -10,6 +10,6 @@ #define VERSION "1.2" // DO NOT MODIFY THE BELOW LINES!!! -#define BUILD_NUMBER "194" -#define BUILD_DATE "07/03/24, 15:48:10" -#define BUILD_CONFIGURATION "DEBUG" +#define BUILD_NUMBER "198" +#define BUILD_DATE "07/03/24, 15:59:07" +#define BUILD_CONFIGURATION "RELEASE"