summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn-Mark Bell <jmb@netsurf-browser.org>2014-11-16 11:18:41 (GMT)
committer John-Mark Bell <jmb@netsurf-browser.org>2014-11-16 11:18:41 (GMT)
commit5bb88a810c485b382b501098122806bda13dc7c0 (patch)
treeb38a5439eddc66077ab7d5377c56fa32ecde137a
parent48ed3b4d9b67fb8edfee3f0d882b795bb3731520 (diff)
downloadttf2f-5bb88a810c485b382b501098122806bda13dc7c0.tar.gz
ttf2f-5bb88a810c485b382b501098122806bda13dc7c0.tar.bz2
Fix up for new buildsystemHEADmaster
-rw-r--r--Makefile4
-rw-r--r--src/Makefile2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dd8431e..fd8d629 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CFLAGS := $(CFLAGS) -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE \
# Freetype2
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
ifneq ($(PKGCONFIG),)
- ifeq ($(TARGET),riscos)
+ ifeq ($(BUILD),arm-unknown-riscos)
CFLAGS := $(CFLAGS) $(shell $(PKGCONFIG) freetype2 --cflags --static)
LDFLAGS := $(LDFLAGS) $(shell $(PKGCONFIG) freetype2 --libs --static)
else
@@ -37,7 +37,7 @@ endif
# OSLib (RISC OS target only)
ifneq ($(findstring clean,$(MAKECMDGOALS)),clean)
- ifeq ($(TARGET),riscos)
+ ifeq ($(BUILD),arm-unknown-riscos)
CFLAGS := $(CFLAGS) -I$(PREFIX)/include -static
LDFLAGS := $(LDFLAGS) -lOSLib32 -lOSLibSupport32 -static
endif
diff --git a/src/Makefile b/src/Makefile
index 251a32c..a9e9e5e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,7 +4,7 @@ DIR_SOURCES := encoding.c ft.c glyphs.c intmetrics.c outlines.c utils.c
ifeq ($(FRONTEND),cli)
DIR_SOURCES := $(DIR_SOURCES) cli.c
else
- ifeq ($(TARGET),riscos)
+ ifeq ($(BUILD),arm-unknown-riscos)
DIR_SOURCES := $(DIR_SOURCES) toolbox.c
endif
endif