diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 17 | ||||
| m--------- | freetype | 0 | ||||
| -rw-r--r-- | src/text.h | 3 |
4 files changed, 17 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules index 5fc57bc..9f754be 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,3 +8,6 @@ [submodule "wgpu"] path = wgpu url = https://github.com/gfx-rs/wgpu-native.git +[submodule "freetype"] + path = freetype + url = https://github.com/freetype/freetype.git @@ -39,10 +39,16 @@ HASHMAP_SOURCE = $(HASHMAP_DIR)/hashmap.c GLAD_DIR = $(WORK_DIR)/glad GLAD_SOURCE = $(GLAD_DIR)/glad.c +FREETYPE_DIR = $(WORK_DIR)/freetype +FREETYPE_BUILD = $(FREETYPE_DIR)/build +FREETYPE_INCLUDE = $(FREETYPE_BUILD)/include +FREETYPE_ARCHIVE = $(FREETYPE_BUILD)/libfreetype.a + CSH_FLAGS += \ -I$(MI_INCLUDE) \ -I$(HASHMAP_DIR) \ - -I$(GLAD_DIR) + -I$(GLAD_DIR) \ + -I$(FREETYPE_INCLUDE) MI_GENERATOR = "Unix Makefiles" @@ -66,7 +72,7 @@ OBJECTS += $(MI_OBJECT) DEPS = $(OBJECTS:.o=.d) -LIBRARIES = -lwayland-client -lEGL -lwayland-egl +LIBRARIES = -lwayland-client -lEGL -lwayland-egl $(FREETYPE_ARCHIVE) all: $(WAYCLOCK) @@ -82,7 +88,7 @@ $(MI_OBJECT): | $(MI_BUILD) @echo " MAKE $@" @$(MAKE) -C $(MI_BUILD) -$(WAYCLOCK): $(OBJECTS) +$(WAYCLOCK): $(OBJECTS) $(LIBRARIES) @echo " LD $@" @$(CXX) $(CXX_FLAGS) -o $@ $^ $(LIBRARIES) @@ -96,8 +102,9 @@ $(WAYCLOCK): $(OBJECTS) .PHONY: clean clean: - @$(RM) $(OBJECTS) $(DEPS) - @$(RM) $(WAYCLOCK) @$(RM) $(MI_BUILD) + @$(RM) $(FREETYPE_BUILD) + @$(RM) $(WAYCLOCK) + @$(RM) $(OBJECTS) $(DEPS) -include $(DEPS)
\ No newline at end of file diff --git a/freetype b/freetype new file mode 160000 +Subproject 85c8efe0afa5ad0df35114e317a065f544943c5 @@ -3,4 +3,5 @@ #include "utils.h" #include "vec.h" -struct font_s {};
\ No newline at end of file + +struct font_s {}; |