summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAshish Gupta <ashmew2@gmail.com>2017-05-13 21:15:38 (GMT)
committer Ashish Gupta <ashmew2@gmail.com>2017-09-12 17:59:04 (GMT)
commitef96bc5357078f6dc09e2e639e9fcc19420a07d9 (patch)
treec3c731653cbd0b511b8550fb72b1569da38f5fdf
parent96f026d2f0e08f2c9ec5cfef25456ade6f2e3c19 (diff)
downloadnetsurf-ef96bc5357078f6dc09e2e639e9fcc19420a07d9.tar.gz
netsurf-ef96bc5357078f6dc09e2e639e9fcc19420a07d9.tar.bz2
Get rid of internal font building from Makefile
-rw-r--r--frontends/kolibrios/Makefile30
1 files changed, 1 insertions, 29 deletions
diff --git a/frontends/kolibrios/Makefile b/frontends/kolibrios/Makefile
index 716166c..fc065d1 100644
--- a/frontends/kolibrios/Makefile
+++ b/frontends/kolibrios/Makefile
@@ -4,9 +4,6 @@ DMACROS := -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE
KOL_OTHER_INCLUDES := -I$(HOME)/kolibrios/contrib/sdk/sources/libpng/ -I$(HOME)/kolibrios/contrib/sdk/sources/zlib -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/kolibrios/contrib/sdk/sources/freetype/include -I$(HOME)/kolibrios/contrib/sdk/sources/libjpeg
CFLAGS += $(KOL_OTHER_INCLUDES) $(DMACROS) -std=c99 -g
-
-# CFLAGS += '-DNETSURF_KOLIBRI_FONTPATH="$(NETSURF_KOLIBRI_FONTPATH)"'
-# CFLAGS += '-DKOLIBRIOS_RESPATH="$(NETSURF_KOLIBRI_RESPATH)"'
CFLAGS += '-DNETSURF_USE_KOLIBRI_HTTPLIB'
##########################################################################
# Only for FB compat with kolibri. Get rid soon.
@@ -89,31 +86,6 @@ endef
S_IMAGES :=
$(eval $(foreach V,$(filter KOLIBRI_IMAGE_%,$(.VARIABLES)),$(call convert_image,$($(V)),$(OBJROOT)/image-$(patsubst KOLIBRI_IMAGE_%,%,$(V)).c,$(patsubst KOLIBRI_IMAGE_%,%,$(V)))))
-# Internal fonts to generate
-KOLIBRI_FONT_internal_ns-sans := $(FRONTEND_SOURCE_DIR)/res/fonts/glyph_data
-
-# Internal font conversion
-$(TOOLROOT)/convert_font: $(TOOLROOT)/created $(FRONTEND_SOURCE_DIR)/fb/convert_font.c
- $(VQ)echo " HOST CC: $@"
- $(Q)$(HOST_CC) -o $@ $(FRONTEND_SOURCE_DIR)/fb/convert_font.c
-
-# 1: input file
-# 2: output source code file
-# 3: output header file
-# 4: font name
-define convert_font
-
-S_FONTS += $(2)
-$(warning Adding to S_FONTS : $(2))
-$(2): $(1) $(TOOLROOT)/convert_font
- $(VQ)echo " FONT: $(1) ($(4))"
- $(Q)$(TOOLROOT)/convert_font -d -H $(3) $(1) $(2)
-endef
-
-S_FONTS :=
-# $(eval $(foreach V,$(filter KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).h,$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)))))
-
-# $(error $(foreach V,$(filter KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,$(.VARIABLES)),$(call convert_font,$($(V)),$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).c,$(OBJROOT)/font-$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)).h,$(patsubst KOLIBRI_FONT_$(NETSURF_KOLIBRI_FONTLIB)_%,%,$(V)))))
# non optional pkg-configed libs
#$(eval $(call pkg_config_find_and_add,libcurl,Curl ))
#$(eval $(call pkg_config_find_and_add,openssl,OpenSSL))
@@ -139,7 +111,7 @@ S_FRAMEBUFFER += $(addprefix fb/fbtk/,$(S_FRAMEBUFFER_FBTK))
S_KOLIBRIOS += $(S_FRAMEBUFFER)
S_FRONTEND := $(S_KOLIBRIOS)
-SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES) $(S_FONTS)
+SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) $(S_IMAGES)
EXETARGET := nskolibrios