From 5bb88a810c485b382b501098122806bda13dc7c0 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sun, 16 Nov 2014 11:18:41 +0000 Subject: Fix up for new buildsystem --- Makefile | 4 ++-- src/Makefile | 2 +- 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 -- cgit v1.2.3