git://scm.lunaixsky.com
/
lunaix-os.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
42211aa
)
Update makefile
author
Lunaixsky
<zelong56@gmail.com>
Sat, 19 Feb 2022 16:42:54 +0000
(16:42 +0000)
committer
GitHub
<noreply@github.com>
Sat, 19 Feb 2022 16:42:54 +0000
(16:42 +0000)
lunaix-os/makefile
patch
|
blob
|
history
diff --git
a/lunaix-os/makefile
b/lunaix-os/makefile
index 4993318c3ec8ac4da4cb4f483fe4ef2b461da846..c25ee5cee93b9e99fa5765bf9e46caa6f50503e4 100644
(file)
--- a/
lunaix-os/makefile
+++ b/
lunaix-os/makefile
@@
-37,7
+37,7
@@
$(BUILD_DIR)/$(OS_ISO): $(ISO_DIR) $(BIN_DIR)/$(OS_BIN) GRUB_TEMPLATE
all: clean $(BUILD_DIR)/$(OS_ISO)
all-debug: O := -O0
all: clean $(BUILD_DIR)/$(OS_ISO)
all-debug: O := -O0
-all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W)
-fomit-frame-pointer
+all-debug: CFLAGS := -g -std=gnu99 -ffreestanding $(O) $(W)
all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
all-debug: clean $(BUILD_DIR)/$(OS_ISO)
@echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
all-debug: LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
all-debug: clean $(BUILD_DIR)/$(OS_ISO)
@echo "Dumping the disassembled kernel code to $(BUILD_DIR)/kdump.txt"
@@
-47,7
+47,7
@@
clean:
@rm -rf $(BUILD_DIR)
run: $(BUILD_DIR)/$(OS_ISO)
@rm -rf $(BUILD_DIR)
run: $(BUILD_DIR)/$(OS_ISO)
- @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::
45454
,server,nowait &
+ @qemu-system-i386 -cdrom $(BUILD_DIR)/$(OS_ISO) -monitor telnet::
$(QEMU_MON_PORT)
,server,nowait &
@sleep 1
@telnet 127.0.0.1 $(QEMU_MON_PORT)
@sleep 1
@telnet 127.0.0.1 $(QEMU_MON_PORT)
@@
-59,4
+59,4
@@
debug-qemu: all-debug
@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
debug-bochs: all-debug
@gdb -s $(BUILD_DIR)/kernel.dbg -ex "target remote localhost:1234"
debug-bochs: all-debug
- @bochs -q -f bochs.cfg
\ No newline at end of file
+ @bochs -q -f bochs.cfg