diff options
| author | Marvin Borner | 2020-08-15 17:42:36 +0200 |
|---|---|---|
| committer | Marvin Borner | 2020-08-15 17:42:36 +0200 |
| commit | 9f16b032d38613ca95e321e1d1e652c43129c68b (patch) | |
| tree | 33f71a84f60b496ed31a128ec542c5341c754b0d /apps | |
| parent | 32b8722128dfb4ca9e814940a23c2b22a283bb12 (diff) | |
Added libgui
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 4 | ||||
| -rw-r--r-- | apps/init.c | 8 | ||||
| -rw-r--r-- | apps/link.ld | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/apps/Makefile b/apps/Makefile index 7678a0b..8f9408e 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -8,14 +8,14 @@ OC = ../cross/opt/bin/i686-elf-objcopy # Flags to make the binary smaller TODO: Remove after indirect pointer support! CSFLAGS = -mpreferred-stack-boundary=2 -fno-asynchronous-unwind-tables -Os -CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../lib/inc/ -Wl,-emain -fPIE -Duserspace +CFLAGS = $(CSFLAGS) -Wall -Wextra -nostdlib -nostdinc -ffreestanding -ffunction-sections -fno-builtin -mgeneral-regs-only -std=c99 -m32 -pedantic-errors -Wl,-emain -I../libc/inc/ -I../libgui/inc/ -Wl,-emain -fPIE -Duserspace all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc + @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lc -lgui @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) # %.o: %.c diff --git a/apps/init.c b/apps/init.c index 5e88eff..0ae4fd9 100644 --- a/apps/init.c +++ b/apps/init.c @@ -5,12 +5,14 @@ #include <mem.h> #include <print.h> #include <sys.h> +#include <vesa.h> -void main() +void main(struct vbe *vbe) { print("Init loaded.\n"); + printf("VBE: %dx%d\n", vbe->width, vbe->height); - exec("/a"); - exec("/b"); + /* exec("/a"); */ + /* exec("/b"); */ exit(); } diff --git a/apps/link.ld b/apps/link.ld index 7a451ba..84b2e2f 100644 --- a/apps/link.ld +++ b/apps/link.ld @@ -4,7 +4,7 @@ ENTRY(main) SECTIONS { - . = 0x00400000; + . = 0x00000000; .text : { *(.text.main) |