diff options
Diffstat (limited to 'frontends/atari/Makefile')
| -rw-r--r-- | frontends/atari/Makefile | 47 |
1 files changed, 34 insertions, 13 deletions
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile index 585f0b217..2f6d7118b 100644 --- a/frontends/atari/Makefile +++ b/frontends/atari/Makefile @@ -8,7 +8,7 @@ # toolchain is located in /usr/bin and the wildcard matching # fails then. So this wildcard matches only works for # the netsurf environment! -STRIP := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*strip) +STRIP := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*-strip) STACK := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*stack) FT2CF := $(GCCSDK_INSTALL_ENV)/bin/freetype-config @@ -33,10 +33,31 @@ endif # non-pkgconfig components -FREETYPE_FONT_CFLAGS := $(shell $(FT2CF) --cflags) -DWITH_FREETYPE_FONT_DRIVER SPIDERMONKEY_CFLAGS := -DXP_UNIX -DJS_HAS_FILE_OBJECT=0 -DJSOPTION_JIT=0 -DPOSIX_SOURCE -D_BSD_SOURCE -$(eval $(call feature_enabled,ATARI_FREETYPE_FONT,$(FREETYPE_FONT_CFLAGS),-lfreetype,(Freetype))) +# freetype is optional but older versions do not use pkg-config +ifeq ($(NETSURF_USE_ATARI_FREETYPE_FONT),YES) + NETSURF_USE_FREETYPE2 := AUTO + NETSURF_FEATURE_FREETYPE2_CFLAGS := -DWITH_FREETYPE_FONT_DRIVER + + $(eval $(call pkg_config_find_and_add_enabled,FREETYPE2,freetype2,freetype2)) + + # try and use non pkg-config method + ifeq ($(NETSURF_USE_FREETYPE2),NO) + FREETYPE_CONFIG_EXISTS := $(shell $(FT2CF) --cflags >/dev/null && echo yes) + ifeq ($(FREETYPE_CONFIG_EXISTS),yes) + NETSURF_USE_FREETYPE2 := YES + CFLAGS += $(shell $(FT2CF) --cflags) $(NETSURF_FEATURE_FREETYPE2_CFLAGS) + LDFLAGS += $(shell $(FT2CF) --libs) + $(info FT2.CNFG: freetype2 (freetype2) enabled) + else + $(info FT2.CNFG: freetype2 (freetype2) failed) + $(error Unable to find library for: freetype2) + endif + endif +endif + + $(eval $(call feature_enabled,ATARI_NETSURF_FONT,-DWITH_INTERNAL_FONT_DRIVER,,(Internal Font))) $(eval $(call feature_enabled,ATARI_VDI_FONT,-DWITH_VDI_FONT_DRIVER,,(VDI Font))) $(eval $(call feature_enabled,ATARI_8BPP_SUPPORT,-DWITH_8BPP_SUPPORT,,(Indexed screen format support))) @@ -64,7 +85,6 @@ S_FRONTEND := \ clipboard.c \ ctxmenu.c \ cookies.c \ - certview.c \ deskmenu.c \ download.c \ encoding.c \ @@ -75,7 +95,6 @@ S_FRONTEND := \ gui.c \ hotlist.c \ history.c \ - login.c \ misc.c \ osspec.c \ redrawslots.c \ @@ -104,8 +123,16 @@ S_FRONTEND := \ # Note this is deliberately *not* expanded here as common and image # are not yet available SOURCES = $(S_COMMON) $(S_IMAGE) $(S_BROWSER) $(S_FRONTEND) + +# --------------------------------------------------------------------------- +# Target setup +# --------------------------------------------------------------------------- + EXETARGET := ns$(SUBTARGET)$(PRGSUFFIX) +# The filter and target for split messages +MESSAGES_FILTER=atari + # ---------------------------------------------------------------------------- # Install target # ---------------------------------------------------------------------------- @@ -121,10 +148,6 @@ ATARI_FONT_SOURCE_DIR := $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME)/ ATARI_GENERIC_RESOURCES := de en it ja nl ATARI_RESOURCES := $(addprefix resources/,$(ATARI_GENERIC_RESOURCES)) -# ---------------------------------------------------------------------------- -# Install target -# ---------------------------------------------------------------------------- - install-atari: # ---------------------------------------------------------------------------- @@ -138,7 +161,7 @@ $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME): package-atari: $(ATARI_FONT_TMP_DIR)$(ATARI_FONT_NAME) $(PKGNAME) $(VQ)echo Creating $(PKGNAME) -$(PKGNAME): $(EXETARGET) +$(PKGNAME): $(EXETARGET) $(POSTEXES) ifneq ($(strip $(STRIP)),) $(Q)echo Stripping symbols from $(EXETARGET) with $(STRIP) $(Q)$(STRIP) $(EXETARGET) @@ -177,10 +200,8 @@ endif $(Q)cp resources/internal.css $(ATARI_TARGET_DIR)res/internal.css $(Q)cp resources/SearchEngines $(ATARI_TARGET_DIR)res/search $(Q)cp resources/ca-bundle $(ATARI_TARGET_DIR)res/cabundle - $(Q)$(RM) $(ATARI_TARGET_DIR)res/messages - $(Q)$(SPLIT_MESSAGES) -l en -p atari -f messages -o $(ATARI_TARGET_DIR)res/messages resources/FatMessages + $(Q)$(INSTALL) -m 644 -T $(MESSAGES_TARGET)/en/Messages $(ATARI_TARGET_DIR)res/messages $(Q)cp resources/en/welcome.html $(ATARI_TARGET_DIR)res/welcome.html - $(Q)cp resources/en/maps.html $(ATARI_TARGET_DIR)res/maps.html $(Q)cp resources/en/licence.html $(ATARI_TARGET_DIR)res/licence.html $(Q)cp resources/en/credits.html $(ATARI_TARGET_DIR)res/credits.html |