From 9d1a184a09600b6eb3ee79ba4754865c8b06633d Mon Sep 17 00:00:00 2001 From: Fabrice Date: Wed, 11 Feb 2026 08:31:44 +0100 Subject: build and link freetype --- Makefile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6e991b9..1f10df9 100644 --- a/Makefile +++ b/Makefile @@ -50,7 +50,7 @@ CSH_FLAGS += \ -I$(GLAD_DIR) \ -I$(FREETYPE_INCLUDE) -MI_GENERATOR = "Unix Makefiles" +CMAKE_GENERATOR = "Unix Makefiles" XDG_SHELL_PROT = $(WORK_DIR)/xdg-shell.xml @@ -76,13 +76,17 @@ LIBRARIES = -lwayland-client -lEGL -lwayland-egl $(FREETYPE_ARCHIVE) all: $(WAYCLOCK) -$(WGPU_LIB): - @echo " CARGO $@" - @$(CARGO) build $(WGPU_BUILD_FLAGS) $(WGPU_MANIFEST_FLAG) +$(FREETYPE_BUILD): + @echo " CMAKE $@" + @$(CMAKE) $(FREETYPE_DIR) -B $@ -G $(CMAKE_GENERATOR) + +$(FREETYPE_ARCHIVE): | $(FREETYPE_BUILD) + @echo " MAKE $@" + @$(MAKE) -C $(FREETYPE_BUILD) $(MI_BUILD): @echo " CMAKE $@" - @$(CMAKE) $(MI_DIR) -B $@ -G $(MI_GENERATOR) $(MI_FLAGS) + @$(CMAKE) $(MI_DIR) -B $@ -G $(CMAKE_GENERATOR) $(MI_FLAGS) $(MI_OBJECT): | $(MI_BUILD) @echo " MAKE $@" -- cgit v1.2.3