diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-10-17 12:59:11 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-10-17 12:59:11 +0200 |
| commit | 45fcf4cc7ddacd93df2dd4d88ad31f6061e8d4a8 (patch) | |
| tree | 4f1a3b3d301cded70af6ff9177d13b8a51f2d825 /Source/Kernel/Makefile | |
| parent | 54d76800cf8010434065556e12f693b101383d8b (diff) | |
| parent | 82756b86977dc65468f6298787d8dca5634ac788 (diff) | |
| download | Melon-45fcf4cc7ddacd93df2dd4d88ad31f6061e8d4a8.tar.gz Melon-45fcf4cc7ddacd93df2dd4d88ad31f6061e8d4a8.zip | |
Merge branch 'heap_class'
Conflicts:
Source/Kernel/Melon.ke
Diffstat (limited to 'Source/Kernel/Makefile')
| -rw-r--r-- | Source/Kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Kernel/Makefile b/Source/Kernel/Makefile index b28f487..56754d0 100644 --- a/Source/Kernel/Makefile +++ b/Source/Kernel/Makefile @@ -5,7 +5,7 @@ CXX = g++ LD = ld LDFLAGS = -T Link.ld -Map Map.txt --oformat=elf32-i386 CFLAGS = -nostdlib -nostartfiles -nodefaultlibs -fno-builtin -fno-stack-protector -Wall -Wextra -Werror -I . -CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I . -Wall -Werror -Wno-write-strings -funsigned-char -D THIS_IS_MELON -D RANDOM_SEED=`date +%N`LL -g +CXXFLAGS = -nostartfiles -nostdlib -fno-exceptions -fno-rtti -I . -Wall -Werror -Wno-write-strings -funsigned-char -D THIS_IS_MELON -D RANDOM_SEED=1`date +%N`LL ASM = nasm ASMFLAGS = -f elf |