diff options
| author | Clyne Sullivan <clyne@bitgloo.com> | 2024-09-27 06:45:13 -0400 |
|---|---|---|
| committer | Clyne Sullivan <clyne@bitgloo.com> | 2024-09-27 06:45:13 -0400 |
| commit | 56f5c483ee516245867a312c7e1520c3f4df16c7 (patch) | |
| tree | d230b66c8eb06e0af915facf20966fbe2c098193 /Makefile | |
| parent | 0f5bbed9a9463adbd23f281f7d7c689cbe7f4182 (diff) | |
convert boot.s to c++
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 30 |
1 files changed, 12 insertions, 18 deletions
@@ -1,20 +1,18 @@ -ASFLAGS := --32 CXXFLAGS := -m32 -ggdb -g3 -O0 -fno-pic -ffreestanding -fno-rtti -fno-exceptions -std=c++23 LDFLAGS := -m32 -static -T link.ld -ffreestanding -nostdlib -ASFILES := boot.s -CXXFILES := gdt.cpp \ - idt.cpp \ - memory.cpp \ - multiboot.cpp \ - pic.cpp \ - pit.cpp \ - tasking.cpp \ - vgaterminal.cpp \ - kernel.cpp +CXXFILES := boot.cpp \ + gdt.cpp \ + idt.cpp \ + memory.cpp \ + multiboot.cpp \ + pic.cpp \ + pit.cpp \ + tasking.cpp \ + vgaterminal.cpp \ + kernel.cpp -OBJS := $(subst .s,.o,$(ASFILES)) \ - $(subst .cpp,.o,$(CXXFILES)) +OBJS := $(subst .cpp,.o,$(CXXFILES)) all: myos.iso @@ -27,10 +25,6 @@ myos.bin: $(OBJS) link.ld @echo " LD " $@ @g++ $(LDFLAGS) -o $@ $(OBJS) -%.o: %.s - @echo " AS " $< - @as $(ASFLAGS) -c $< -o $@ - %.o: %.cpp @echo " CXX " $< @g++ $(CXXFLAGS) -c $< -o $@ @@ -41,5 +35,5 @@ clean: run: myos.iso @echo " QEMU" - @qemu-system-i386 -cdrom $< -monitor stdio -no-reboot -s -S #-d int + @qemu-system-i386 -cdrom $< -monitor stdio -no-reboot #-s -S #-d int |