blob: 616d2af41078bb3660677e85ab81bf403dbf461e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
https://github.com/OpenTTD/OpenGFX/pull/80
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ GREP ?= grep
PYTHON ?= python
# Graphics processing
-GIMP ?= $(shell which gimp)
+GIMP ?= $(shell command -v gimp)
GIMP_FLAGS ?= -n -i
# NML
@@ -116,7 +116,7 @@ ifdef PNML_FILES
endif
# GRF tools
-GRFID ?= $(shell which grfid)
+GRFID ?= $(shell command -v grfid)
GRFID_FLAGS ?= -m
MUSA ?= musa.py
# The license is set via bananas.ini, do not supply a "custom" license.
@@ -606,7 +606,7 @@ endif
ifeq ($(shell echo "$(OSTYPE)" | cut -d_ -f1),MINGW32)
# If CC has been set to the default implicit value (cc), check if it can be used. Otherwise use a saner default.
ifeq "$(origin CC)" "default"
- CC=$(shell which cc 2>/dev/null && echo "cc" || echo "gcc")
+ CC=$(shell command -v cc 2>/dev/null && echo "cc" || echo "gcc")
endif
WIN_VER = $(shell echo "$(OSTYPE)" | cut -d- -f2 | cut -d. -f1)
ifeq ($(WIN_VER),5)
|
