diff options
| author | Marvin Borner | 2021-03-26 21:55:50 +0100 |
|---|---|---|
| committer | Marvin Borner | 2021-03-26 22:02:20 +0100 |
| commit | 05498860e8f7b1e8bb27880bc7526de026694804 (patch) | |
| tree | 3bddf16e9439a950a3810d45e42a5cefdbcb7663 /apps | |
| parent | a96e9c4c858d47f61b89d879aa0ce6a02bdacb38 (diff) | |
Renamed libs
Cleaner and more flexible.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/Makefile | 2 | ||||
| -rw-r--r-- | apps/window.c | 2 | ||||
| -rw-r--r-- | apps/wm.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/Makefile b/apps/Makefile index d43104a..f2ab790 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -6,7 +6,7 @@ LD = ccache ../cross/opt/bin/i686-elf-ld OC = ccache ../cross/opt/bin/i686-elf-objcopy ST = ccache ../cross/opt/bin/i686-elf-strip -CFLAGS = $(CFLAGS_DEFAULT) -I../libc/inc/ -I../libgui/inc/ -I../libtxt/inc/ -Duserspace +CFLAGS = $(CFLAGS_DEFAULT) -I../libs/ -I../libs/libc/inc/ -Duserspace all: $(COBJS) diff --git a/apps/window.c b/apps/window.c index 08c4263..4dbf9dc 100644 --- a/apps/window.c +++ b/apps/window.c @@ -1,7 +1,7 @@ // MIT License, Copyright (c) 2021 Marvin Borner #include <assert.h> -#include <gui.h> +#include <libgui/gui.h> #include <print.h> int main(void) @@ -3,15 +3,15 @@ #include <assert.h> #include <def.h> #include <errno.h> -#include <gfx.h> -#include <gui.h> #include <input.h> #include <ioctl.h> -#include <keymap.h> +#include <libgui/gfx.h> +#include <libgui/gui.h> +#include <libgui/msg.h> +#include <libgui/vesa.h> +#include <libtxt/keymap.h> #include <list.h> -#include <msg.h> #include <random.h> -#include <vesa.h> //#define FLUSH_TIMEOUT 6 |