mirror of
https://github.com/netsurf-browser/netsurf
synced 2024-11-26 16:29:36 +03:00
Use ccres (http://www.riscos.info/index.php/CCres) to compile textual
versions of our Templates to their binary versions. This allows us during the build to conditionally enable/disable certain icons or change the icon representation. Change made by jmb & joty. svn path=/trunk/netsurf/; revision=4929
This commit is contained in:
parent
114f948f36
commit
15eb877a4c
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
41
Makefile
41
Makefile
@ -106,6 +106,8 @@ ifeq ($(TARGET),riscos)
|
||||
ifeq ($(HOST),riscos)
|
||||
# Build for RO on RO
|
||||
GCCSDK_INSTALL_ENV := <NSLibs$$Dir>
|
||||
CCRES := ccres
|
||||
TPLEXT :=
|
||||
CC := gcc
|
||||
EXEEXT :=
|
||||
PKG_CONFIG :=
|
||||
@ -114,6 +116,8 @@ ifeq ($(TARGET),riscos)
|
||||
# either using GCCSDK 4 - ELF)
|
||||
GCCSDK_INSTALL_ENV ?= /home/riscos/env
|
||||
GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
|
||||
CCRES := $(GCCSDK_INSTALL_CROSSBIN)/ccres
|
||||
TPLEXT := ,fec
|
||||
CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
|
||||
ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
|
||||
SUBTARGET := -elf
|
||||
@ -297,6 +301,11 @@ endif
|
||||
# ----------------------------------------------------------------------------
|
||||
|
||||
ifeq ($(TARGET),riscos)
|
||||
TPD_RISCOS = $(foreach TPL,$(notdir $(TPL_RISCOS)), \
|
||||
!NetSurf/Resources/$(TPL)/Templates$(TPLEXT))
|
||||
|
||||
RESOURCES = $(TPD_RISCOS)
|
||||
|
||||
CFLAGS += -I. $(OPTFLAGS) $(WARNFLAGS) -Driscos \
|
||||
-std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
|
||||
-mpoke-function-name
|
||||
@ -462,6 +471,38 @@ $(RSRC_BEOS): $(RDEF_BEOS) $(RDEP_BEOS)
|
||||
$(Q)$(BEOS_RC) -o $@ $<
|
||||
endif
|
||||
|
||||
ifeq ($(TARGET),riscos)
|
||||
# Native RO build is different as 1) it can't do piping and 2) ccres on
|
||||
# RO does not understand Unix filespec
|
||||
ifeq ($(HOST),riscos)
|
||||
define compile_template
|
||||
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
|
||||
$$(VQ)echo "TEMPLATE: $(2)"
|
||||
$$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) > processed_template
|
||||
$$(Q)$$(CCRES) processed_template $$(subst /,.,$$@)
|
||||
$$(Q)$(RM) processed_template
|
||||
CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT)
|
||||
|
||||
endef
|
||||
else
|
||||
define compile_template
|
||||
!NetSurf/Resources/$(1)/Templates$$(TPLEXT): $(2)
|
||||
$$(VQ)echo "TEMPLATE: $(2)"
|
||||
$$(Q)$$(CC) -x c -E -P $$(CFLAGS) $(2) | $$(CCRES) - $$@
|
||||
CLEAN_TEMPLATES += !NetSurf/Resources/$(1)/Templates$$(TPLEXT)
|
||||
|
||||
endef
|
||||
endif
|
||||
|
||||
clean-templates:
|
||||
$(VQ)echo " CLEAN: $(CLEAN_TEMPLATES)"
|
||||
$(Q)$(RM) $(CLEAN_TEMPLATES)
|
||||
CLEANS += clean-templates
|
||||
|
||||
$(eval $(foreach TPL,$(TPL_RISCOS), \
|
||||
$(call compile_template,$(notdir $(TPL)),$(TPL))))
|
||||
endif
|
||||
|
||||
clean-target:
|
||||
$(VQ)echo " CLEAN: $(EXETARGET)"
|
||||
$(Q)$(RM) $(EXETARGET)
|
||||
|
@ -55,6 +55,8 @@ S_RISCOS := 401login.c artworks.c assert.c awrender.s bitmap.c buffer.c \
|
||||
con_fonts.c con_home.c con_image.c con_inter.c con_language.c \
|
||||
con_memory.c con_secure.c con_theme.c)
|
||||
S_RISCOS := $(addprefix riscos/,$(S_RISCOS))
|
||||
TPL_RISCOS := de en fr nl # TODO: It'd be nice to auto-detect these
|
||||
TPL_RISCOS := $(addprefix riscos/templates/,$(TPL_RISCOS))
|
||||
|
||||
# S_GTK are sources purely for the GTK build
|
||||
S_GTK := font_pango.c gtk_bitmap.c gtk_gui.c gtk_schedule.c \
|
||||
|
3881
riscos/templates/de
Normal file
3881
riscos/templates/de
Normal file
File diff suppressed because it is too large
Load Diff
3871
riscos/templates/en
Normal file
3871
riscos/templates/en
Normal file
File diff suppressed because it is too large
Load Diff
3895
riscos/templates/fr
Normal file
3895
riscos/templates/fr
Normal file
File diff suppressed because it is too large
Load Diff
3879
riscos/templates/nl
Normal file
3879
riscos/templates/nl
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user