mirror of
https://github.com/UpsilonNumworks/Upsilon.git
synced 2026-03-18 21:30:38 +01:00
Merge branch 'upsilon-dev-latex'
This commit is contained in:
@@ -21,10 +21,8 @@ kandinsky_src += $(addprefix kandinsky/src/,\
|
||||
rect.cpp \
|
||||
)
|
||||
|
||||
kandinsky_src += $(addprefix kandinsky/fonts/, \
|
||||
LargeFont.ttf \
|
||||
SmallFont.ttf \
|
||||
)
|
||||
simple_kandinsky_src := $(kandinsky_src)
|
||||
default_kandinsky_src := $(kandinsky_src)
|
||||
|
||||
tests_src += $(addprefix kandinsky/test/,\
|
||||
color.cpp\
|
||||
@@ -53,16 +51,53 @@ $(eval $(call rule_for, \
|
||||
|
||||
RASTERIZER := $(BUILD_DIR)/kandinsky/fonts/rasterizer
|
||||
|
||||
# Define a rasterizing recipe. Parameters : font name, size, packed_width, packed_height
|
||||
# Define a rasterizing recipe. Parameters : font source, font name, size, packed_width, packed_height
|
||||
define raster_font
|
||||
$(call rule_for, \
|
||||
RASTER, \
|
||||
kandinsky/fonts/$(1).cpp, \
|
||||
kandinsky/fonts/$(2).cpp, \
|
||||
kandinsky/fonts/$(1).ttf $$(RASTERIZER), \
|
||||
$$(RASTERIZER) $$< $(2) $(2) $(3) $(4) $(1) $$@ $(if $(HAS_LIBPNG),$$(basename $$@).png), \
|
||||
$$(RASTERIZER) $$< $(3) $(4) $(4) $(5) $(6) $(1) $$@ $(if $(HAS_LIBPNG),$$(basename $$@).png), \
|
||||
global \
|
||||
)
|
||||
endef
|
||||
|
||||
$(eval $(call raster_font,SmallFont,12,7,14))
|
||||
$(eval $(call raster_font,LargeFont,16,10,18))
|
||||
ifdef HAS_READER
|
||||
|
||||
kandinsky_src += $(addprefix kandinsky/fonts/, \
|
||||
LargeFontExtended.ttf \
|
||||
SmallFontExtended.ttf \
|
||||
LargeFontSimple.ttf \
|
||||
SmallFontSimple.ttf \
|
||||
)
|
||||
|
||||
default_kandinsky_src += $(addprefix kandinsky/fonts/, \
|
||||
LargeFontExtended.ttf \
|
||||
SmallFontExtended.ttf \
|
||||
)
|
||||
|
||||
simple_kandinsky_src += $(addprefix kandinsky/fonts/, \
|
||||
LargeFontSimple.ttf \
|
||||
SmallFontSimple.ttf \
|
||||
)
|
||||
|
||||
$(eval $(call raster_font,SmallFont,SmallFontExtended,1,12,7,14))
|
||||
$(eval $(call raster_font,LargeFont,LargeFontExtended,1,16,10,18))
|
||||
|
||||
$(eval $(call raster_font,SmallFont,SmallFontSimple,0,12,7,14))
|
||||
$(eval $(call raster_font,LargeFont,LargeFontSimple,0,16,10,18))
|
||||
|
||||
else
|
||||
|
||||
kandinsky_src += $(addprefix kandinsky/fonts/, \
|
||||
LargeFont.ttf \
|
||||
SmallFont.ttf \
|
||||
)
|
||||
|
||||
simple_kandinsky_src = $(kandinsky_src)
|
||||
default_kandinsky_src = $(kandinsky_src)
|
||||
|
||||
$(eval $(call raster_font,SmallFont,SmallFontSimple,0,12,7,14))
|
||||
$(eval $(call raster_font,LargeFont,LargeFontSimple,0,16,10,18))
|
||||
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user