From ad2a93de9cb01f59c62bbb0aac198c059f6bf5a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 16 Nov 2019 10:53:42 +0100 Subject: [PATCH] Fix atari crossbuild with netsurf toolchains --- src/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index 0a30629f..94f54ddb 100644 --- a/src/Makefile +++ b/src/Makefile @@ -619,13 +619,16 @@ endif FIX_FLAGS = $(ARCH)-atari-mint-flags FCLOPT = #LIBPNG_CONFIG = $(wildcard $(PREFIX)/bin/libpng12-config $(PREFIX)/bin/libpng14-config $(PREFIX)/bin/libpng16-config) - LIBPNG_CONFIG ?= $(shell which ../3rdparty/usr-atari/bin/libpng-config) - SDLCONFIG ?= $(shell which ../3rdparty/usr-atari/bin/sdl-config) + LIBPNG_CONFIG ?= $(shell which ../3rdparty/usr-atari/bin/libpng-config || which $(PREFIX)/bin/libpng16-config) + SDLCONFIG ?= $(shell which ../3rdparty/usr-atari/bin/sdl-config || which $(PREFIX)/bin/sdl-config) COPT = -W -Wall COPT += $(MCPU) -fomit-frame-pointer -std=c99 -Wdeclaration-after-statement COPT += -D__MINT__ -ffast-math -O$(OPTIM) - # -I$(PREFIX)/include - COPT += -I../3rdparty/usr-atari/include + ifneq ($(wildcard ../3rdparty/usr-atari/include),) + COPT += -I../3rdparty/usr-atari/include + else + COPT += -I$(PREFIX)/include + endif COPT += $(shell $(LIBPNG_CONFIG) --cflags) COPT += $(shell $(SDLCONFIG) --cflags) COPT += $(JOYCOPT) $(LUACOPT)