diff options
Diffstat (limited to 'userspace/Makefile')
| -rw-r--r-- | userspace/Makefile | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/userspace/Makefile b/userspace/Makefile index af799fb..f7d0ae5 100644 --- a/userspace/Makefile +++ b/userspace/Makefile @@ -1,38 +1,41 @@ -IMAGESIZE=30000 #ext2.img size in Kb +IMAGESIZE=40000 #ext2.img size in Kb ####################### GIT_REVISION=$(shell git rev-parse HEAD) CC=i686-foolos-gcc -CC=i686-elf-gcc -AS=i686-elf-as +AS=i686-foolos-as -CC = @echo "Compiling (i686-elf-gcc) $<..."; i686-elf-gcc -AS = @echo "Assembling (i686-elf-as) $<..."; i686-elf-as +#CC=i686-elf-gcc +#AS=i686-elf-as + +#CC = @echo "Compiling (i686-elf-gcc) $<..."; $(CC) +#AS = @echo "Assembling (i686-elf-as) $<..."; $(AS) CFLAGS= CFLAGS+=-DGIT_REVISION=\"$(GIT_REVISION)\" CFLAGS+=-w CFLAGS+=-I.. -CFLAGS+=-I/home/miguel/temp/foolos/usr/i686-foolos/include +#CFLAGS+=-I/home/miguel/temp/foolos/usr/i686-foolos/include CFLAGS+=-O0 CFLAGS+=-g CFLAGS+= -Werror=implicit-function-declaration -LDFLAGS=-L/home/miguel/temp/foolos/usr/i686-foolos/lib/ -LDLIBS=-lc -lm -lg -lnosys +#LDFLAGS=-L/home/miguel/temp/foolos/usr/i686-foolos/lib/ +#LDLIBS=-lc -lm -lg -lnosys PROGS_C=$(wildcard *.c) PROGS=$(patsubst %.c,%,$(PROGS_C)) include ../Makefile.common -all: crt0.o ext2.img +all: ext2.img ext2.img: $(PROGS) make -C fonts make -C xterm + make -C cpp @echo "----------------------" @echo "Creating ext2.img ...." @dd if=/dev/zero of=ext2.img bs=1024 count=$(IMAGESIZE) @@ -50,6 +53,7 @@ ext2.img: $(PROGS) @cp $(PROGS) mnt/bin @cp fonts/binfont.bin mnt/doc/fonts @cp xterm/xterm mnt/bin + @cp cpp/testcpp mnt/bin # cp ~/temp/fool-os-stuff/binutils-build-host-foolos/binutils/readelf mnt/bin # cp ../font/binfont.bin mnt/ @@ -72,6 +76,7 @@ ext2.img: $(PROGS) clean: make -C fonts clean make -C xterm clean + make -C cpp clean @echo "Cleaning userspace ..."; rm -f *.o $(PROGS) ext2.img *.d new: clean all |