walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Makefile to build without glib

This commit is contained in:
Behdad Esfahbod 2009-11-02 18:33:52 -05:00
parent 68a2c771e2
commit 63a792a811
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.am
View File

@ -13,8 +13,6 @@ HBSOURCES = \
hb-buffer-private.h \ hb-buffer-private.h \
hb-font.cc \ hb-font.cc \
hb-font-private.h \ hb-font-private.h \
hb-glib.h \
hb-glib.c \
hb-private.h \ hb-private.h \
hb-shape.h \ hb-shape.h \
hb-shape.c \ hb-shape.c \
@ -32,7 +30,6 @@ HBSOURCES = \
hb-ot-layout-private.h \ hb-ot-layout-private.h \
hb-object-private.h \ hb-object-private.h \
$(NULL) $(NULL)
HBHEADERS = \ HBHEADERS = \
hb.h \ hb.h \
hb-blob.h \ hb-blob.h \
@ -43,6 +40,15 @@ HBHEADERS = \
hb-ot-layout.h \ hb-ot-layout.h \
$(NULL) $(NULL)
if HAVE_GLIB
HBSOURCES += \
hb-glib.c \
$(NULL)
HBHEADERS += \
hb-glib.h \
$(NULL)
endif
libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS)
libharfbuzz_la_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS) libharfbuzz_la_CPPFLAGS = -DHAVE_GLIB $(GLIB_CFLAGS)
libharfbuzz_la_LIBADD = $(GLIB_LIBS) libharfbuzz_la_LIBADD = $(GLIB_LIBS)

2
src/hb-glib.c
View File

@ -30,6 +30,8 @@
#include "hb-unicode-private.h" #include "hb-unicode-private.h"
#include <glib.h>
static hb_codepoint_t hb_glib_get_mirroring (hb_codepoint_t unicode) { g_unichar_get_mirror_char (unicode, &unicode); return unicode; } static hb_codepoint_t hb_glib_get_mirroring (hb_codepoint_t unicode) { g_unichar_get_mirror_char (unicode, &unicode); return unicode; }
static hb_category_t hb_glib_get_general_category (hb_codepoint_t unicode) { return g_unichar_type (unicode); } static hb_category_t hb_glib_get_general_category (hb_codepoint_t unicode) { return g_unichar_type (unicode); }
static hb_script_t hb_glib_get_script (hb_codepoint_t unicode) { return g_unichar_get_script (unicode); } static hb_script_t hb_glib_get_script (hb_codepoint_t unicode) { return g_unichar_get_script (unicode); }