m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix atari crossbuild with netsurf toolchains

Browse Source
This commit is contained in:
François Revol 2019-11-16 10:53:42 +01:00
parent 2f7809baff
commit ad2a93de9c
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Makefile
View File

@ -619,13 +619,16 @@ endif
FIX_FLAGS = $(ARCH)-atari-mint-flags FIX_FLAGS = $(ARCH)-atari-mint-flags
FCLOPT = FCLOPT =
#LIBPNG_CONFIG = $(wildcard $(PREFIX)/bin/libpng12-config $(PREFIX)/bin/libpng14-config $(PREFIX)/bin/libpng16-config) #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) LIBPNG_CONFIG ?= $(shell which ../3rdparty/usr-atari/bin/libpng-config || which $(PREFIX)/bin/libpng16-config)
SDLCONFIG ?= $(shell which ../3rdparty/usr-atari/bin/sdl-config) SDLCONFIG ?= $(shell which ../3rdparty/usr-atari/bin/sdl-config || which $(PREFIX)/bin/sdl-config)
COPT = -W -Wall COPT = -W -Wall
COPT += $(MCPU) -fomit-frame-pointer -std=c99 -Wdeclaration-after-statement COPT += $(MCPU) -fomit-frame-pointer -std=c99 -Wdeclaration-after-statement
COPT += -D__MINT__ -ffast-math -O$(OPTIM) COPT += -D__MINT__ -ffast-math -O$(OPTIM)
# -I$(PREFIX)/include ifneq ($(wildcard ../3rdparty/usr-atari/include),)
COPT += -I../3rdparty/usr-atari/include COPT += -I../3rdparty/usr-atari/include
else
COPT += -I$(PREFIX)/include
endif
COPT += $(shell $(LIBPNG_CONFIG) --cflags) COPT += $(shell $(LIBPNG_CONFIG) --cflags)
COPT += $(shell $(SDLCONFIG) --cflags) COPT += $(shell $(SDLCONFIG) --cflags)
COPT += $(JOYCOPT) $(LUACOPT) COPT += $(JOYCOPT) $(LUACOPT)