diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 7 | ||||
| -rw-r--r-- | apps/init.c | 5 | ||||
| -rw-r--r-- | apps/window.c | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/apps/Makefile b/apps/Makefile index 1a7aff3..9ad268e 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -5,16 +5,15 @@ CC = ccache ../cross/opt/bin/i686-elf-gcc LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy -CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -fPIE -Duserspace +CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -Duserspace all: $(COBJS) %.o: %.c @mkdir -p ../build/apps/ @$(CC) -c $(CFLAGS) $< -o $@ - @$(LD) -o $(@:.o=.elf) -Tlink.ld -L../build/ $@ -lgui -ltxt -lc - @$(OC) -O binary $(@:.o=.elf) ../build/apps/$(@:.o=) - @cp $(@:.o=.elf) ../build/apps/$(@:.o=.elf) + @$(LD) -o $(@:.o=.elf) -L../build/ $@ -lgui -ltxt -lc + @cp $(@:.o=.elf) ../build/apps/$(@:.o=) # %.o: %.c # @mkdir -p ../build/apps/ diff --git a/apps/init.c b/apps/init.c index 35d296b..c26e3ad 100644 --- a/apps/init.c +++ b/apps/init.c @@ -8,9 +8,12 @@ int main(int argc, char **argv) { UNUSED(argc); UNUSED(argv); + log("Arrived!\n"); + while (1) + ; assert(exec("/bin/wm", "wm", NULL) == 0); - /* assert(exec("/bin/window", "test", NULL) == 0); */ + assert(exec("/bin/window", "test", NULL) == 0); return 0; } diff --git a/apps/window.c b/apps/window.c index 90a414c..0f9e7d1 100644 --- a/apps/window.c +++ b/apps/window.c @@ -8,8 +8,7 @@ int main(void) { struct gui_window win = { 0 }; assert(gui_new_window(&win) > 0); - while (1) - ; + return 0; #if 0 gfx_fill(win.ctx, COLOR_GREEN); // Professional testing |