git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
formated code and fix include error in interrupts.c
[lunaix-os.git]
/
lunaix-os
/
makefile
diff --git
a/lunaix-os/makefile
b/lunaix-os/makefile
index 2ffc9304c692e0d72bc252a331c4945907c0dc81..2ff30c0eb64237e3c90822de8c5da038dfa66d73 100644
(file)
--- a/
lunaix-os/makefile
+++ b/
lunaix-os/makefile
@@
-18,7
+18,7
@@
OS_ISO = $(OS_NAME).iso
CC := i686-elf-gcc
AS := i686-elf-as
CC := i686-elf-gcc
AS := i686-elf-as
-O := -O
3
+O := -O
2
W := -Wall -Wextra
CFLAGS := -std=gnu99 -ffreestanding $(O) $(W)
LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
W := -Wall -Wextra
CFLAGS := -std=gnu99 -ffreestanding $(O) $(W)
LDFLAGS := -ffreestanding $(O) -nostdlib -lgcc
@@
-39,7
+39,7
@@
$(ISO_DIR):
$(OBJECT_DIR)/%.S.o: %.S
@mkdir -p $(@D)
$(OBJECT_DIR)/%.S.o: %.S
@mkdir -p $(@D)
- $(CC) -c $< -o $@
+ $(CC)
$(INCLUDES)
-c $< -o $@
$(OBJECT_DIR)/%.c.o: %.c
@mkdir -p $(@D)
$(OBJECT_DIR)/%.c.o: %.c
@mkdir -p $(@D)