Move windowserver into "fenster" project, cleanup build, get rid of libfont

Author: maxdev1

applications/Makefile

@@ -8,7 +8,7 @@ fi
 # Build configuration
 ARTIFACT_NAME="desktop.bin"
 CFLAGS_ADD="-I$SYSROOT_SYSTEM_INCLUDE/freetype2"
-LDFLAGS="-lproperties -lfont -lwindow -lcairo -lfreetype -lpixman-1 -lpng -lz"
+LDFLAGS="-lproperties -lwindow -lcairo -lfreetype -lpixman-1 -lpng -lz"
 
 # Include application build tasks
 . "../applications.sh"

applications/desktop/build.sh

@@ -21,7 +21,7 @@
 #include "item.hpp"
 #include <cairo/cairo.h>
 #include <math.h>
-#include <libfont/text_alignment.hpp>
+#include <libwindow/font/text_alignment.hpp>
 #include <libwindow/color_argb.hpp>
 #include <helper.hpp>
 

applications/desktop/src/item.cpp

@@ -23,8 +23,8 @@
 #include <cairo/cairo.h>
 #include <cstdlib>
 #include <map>
-#include <libfont/text_layouter.hpp>
-#include <libfont/font_loader.hpp>
+#include <libwindow/font/text_layouter.hpp>
+#include <libwindow/font/font_loader.hpp>
 #include <helper.hpp>
 
 g_font* font = nullptr;

applications/desktop/src/taskbar.cpp

@@ -24,7 +24,7 @@
 #include <libwindow/canvas.hpp>
 #include <libwindow/selection.hpp>
 #include <libwindow/window.hpp>
-#include <libfont/text_layouter.hpp>
+#include <libwindow/font/text_layouter.hpp>
 #include <vector>
 
 struct taskbar_entry_t

applications/desktop/src/taskbar.hpp

@@ -0,0 +1,22 @@
+SUBPROJECTS := libjson libproperties libwindow libfont windowserver
+
+.PHONY: all clean
+
+all: build install
+
+build:
+	@$(MAKE) -C libjson
+	@$(MAKE) -C libjson install
+	@$(MAKE) -C libproperties
+	@$(MAKE) -C libproperties install
+	@$(MAKE) -C libwindow
+	@$(MAKE) -C libwindow install
+	@$(MAKE) -C windowserver
+
+install:
+	@$(MAKE) -C windowserver install
+
+clean:
+	@for dir in $(SUBPROJECTS); do \
+		$(MAKE) -C $$dir clean; \
+	done

applications/fenster/Makefile

@@ -1,8 +1,4 @@
-ifeq ($(target),windows)
-	-include ../windows-mingw.mk
-else
-	-include ../../ghost.mk
-endif
+include ../platform.mk
 
 LIB := libjson.a
 CXXFLAGS := -Iinc -I$(SYSROOT)/system/include -std=c++17 # -Wall -Wextra