Commit 177ef900 authored by Peter Kovář's avatar Peter Kovář

[WIP]

parent 8ee24a21
Pipeline #19917 failed with stage
......@@ -2,6 +2,7 @@ TARGET = Cube
CFILES = $(TARGET).c
HEADERS = ../../Headers
SHADERS = ../../Shaders
FONTCONFIG = fontconfig
FREETYPE = freetype2
HARFBUZZ = harfbuzz
RAQM = raqm
......@@ -12,10 +13,10 @@ CFLAGS += -I$(HEADERS) -I$(SHADERS)
LIBS = -lFontasy -lvulkan -lm
LIBS += `$(PKGCONFIG) --libs $(COMPONENTS)`
#Linux_CFLAGS += -DVK_USE_PLATFORM_XCB_KHR
#Linux_LIBS = -lxcb
Linux_CFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR
Linux_LIBS = -lwayland-client
Linux_CFLAGS += -DVK_USE_PLATFORM_XCB_KHR
Linux_LIBS = -lxcb
#Linux_CFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR
#Linux_LIBS = -lwayland-client
include $(PEAK)/include/make/definitions
include $(PROGRAMRULES)
TARGET = Glyph
CFILES = $(TARGET).c
FONTCONFIG = fontconfig
FREETYPE = freetype2
HARFBUZZ = harfbuzz
RAQM = raqm
COMPONENTS = $(FONTCONFIG) $(FREETYPE) $(HARFBUZZ) $(RAQM)
CFLAGS += `$(PKGCONFIG) --cflags $(COMPONENTS)`
CFLAGS += -I../../Headers
LIBS = -lFontasy
......
TARGET = Subpixel
CFILES = $(TARGET).c
FONTCONFIG = fontconfig
FREETYPE = freetype2
HARFBUZZ = harfbuzz
RAQM = raqm
COMPONENTS = $(FONTCONFIG) $(FREETYPE) $(HARFBUZZ) $(RAQM)
CFLAGS += `$(PKGCONFIG) --cflags $(COMPONENTS)`
CFLAGS += -I../../Headers -I../../Shaders
LIBS = -lFontasy -lvulkan -lm
......
......@@ -23,6 +23,6 @@ using namespace fontasy;
#endif /* NOT_USING_FONTASY_NAMESPACE */
#endif /* __cplusplus */
int fontasy_line (raqm_t **rq, char* text, uint length, char *language, FT_Face font);
int fontasy_line (raqm_t **rq, const char *text, uint length, char *language, FT_Face font);
#endif /* FONTASY_H */
......@@ -2,13 +2,14 @@
#include <float.h>
#include <stdlib.h>
#include <string.h>
#include "Fontasy.h"
#include <ft2build.h>
#include FT_IMAGE_H
#include FT_TYPES_H
int fontasy_line (raqm_t **rq, char* text, uint length, char *language, FT_Face font)
#include "Fontasy.h"
int fontasy_line (raqm_t **rq, const char *text, uint length, char *language, FT_Face font)
{
raqm_t *line;
bool result;
......
......@@ -22,7 +22,7 @@ RAQM = raqm
COMPONENTS = $(FONTCONFIG) $(FREETYPE) $(FRIBIDI) $(HARFBUZZ) $(RAQM)
CFLAGS += -I../Headers -I../Headers/Fontasy
CINCLUDES += -I../Headers -I../Headers/Fontasy
CFLAGS += `$(PKGCONFIG) --cflags $(COMPONENTS)`
LDFLAGS += --lto
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment