From 05498860e8f7b1e8bb27880bc7526de026694804 Mon Sep 17 00:00:00 2001
From: Marvin Borner
Date: Fri, 26 Mar 2021 21:55:50 +0100
Subject: Renamed libs

Cleaner and more flexible.
---
 apps/Makefile |  2 +-
 apps/window.c |  2 +-
 apps/wm.c     | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'apps')

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)
diff --git a/apps/wm.c b/apps/wm.c
index f43a3f0..e522fc2 100644
--- a/apps/wm.c
+++ b/apps/wm.c
@@ -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
 
-- 
cgit v1.2.3