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

Makefile: custom "which" function to work around OS X 10.4 which command limitations

Browse Source
This commit is contained in:
Thomas BERNARD 2020-02-10 10:11:10 +01:00
parent 85906549b5
commit c2a1eb0d26
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile
View File

@ -22,6 +22,10 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Grafx2; if not, see <http://www.gnu.org/licenses/> # along with Grafx2; if not, see <http://www.gnu.org/licenses/>
# custom which function that takes 2 arguments to work around "which" commands
# that do not return FALSE (OS X 10.4). Usage : $(call which,arg1,arg2)
which = $(shell P=`which "$(1)"` ; if [ "$$?" = "0" ] && [ -x "$$P" ]; then echo "$$P" ; else which "$(2)" ; fi)
# make V=1 to enable verbose building # make V=1 to enable verbose building
V ?= 0 V ?= 0
@ -226,7 +230,7 @@ ifneq ($(PKG_CONFIG_PATH), )
endif endif
ifeq ($(API),sdl) ifeq ($(API),sdl)
SDLCONFIG := $(shell which ../3rdparty/usr/bin/sdl-config || which sdl-config) SDLCONFIG := $(call which,../3rdparty/usr/bin/sdl-config,sdl-config)
ifneq ($(SDLCONFIG), ) ifneq ($(SDLCONFIG), )
# these are for use with macports # these are for use with macports
SDLCOPT = $(shell $(SDLCONFIG) --cflags) SDLCOPT = $(shell $(SDLCONFIG) --cflags)
@ -304,7 +308,7 @@ ifdef MACOSX_LION
LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz LOPT = $(SDLLOPT) $(LUALOPT) -framework libpng14 -lz
else else
LOPT = $(SDLLOPT) $(LUALOPT) $(TTFLOPT) LOPT = $(SDLLOPT) $(LUALOPT) $(TTFLOPT)
LIBPNGCONFIG := $(shell which ../3rdparty/usr/bin/libpng-config || which libpng-config) LIBPNGCONFIG := $(call which,../3rdparty/usr/bin/libpng-config,libpng-config)
ifneq ($(LIBPNGCONFIG), ) ifneq ($(LIBPNGCONFIG), )
COPT += $(shell $(LIBPNGCONFIG) --cflags) COPT += $(shell $(LIBPNGCONFIG) --cflags)
ifneq ($(OSX_STATIC), 1) ifneq ($(OSX_STATIC), 1)