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
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
|
--- a/Makefile 2021-08-02 13:54:26.603900984 -0500
+++ b/Makefile 2021-08-02 13:57:26.018910565 -0500
@@ -186,7 +186,7 @@
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not')
-HOST := $(shell sh -c 'cc -dumpmachine || echo unknown')
+HOST :=
ARCH := $(HOST)
ifdef CROSSHOST
@@ -457,15 +457,7 @@
GCC_VER_SUFFIX:=-$(GCC_VER)
endif
-# Attempt to use a full compiler name, to make
-# distcc builds work nicely.
-LMACH := $(shell gcc -dumpmachine)-
-ifeq ($(LMACH),-)
LMACH :=
-endif
-ifeq ($(shell which $(LMACH)gcc$(GCC_VER_SUFFIX) > /dev/null 2> /dev/null && echo "Yes"),)
-LMACH :=
-endif
ifneq ($(FORCE_CC),)
GCC := $(FORCE_CC)
@@ -765,7 +757,6 @@
FULLDEBUG=YesPlease
DEBUG=YesPlease
NO_OPTIMIZE=YesPlease
- COVERAGE=YesPlease
endif
# Debug-Lite
@@ -773,7 +764,6 @@
ifneq (,$(filter debug-lite,$(MAKECMDGOALS)))
DEBUG=YesPlease
NO_OPTIMIZE=YesPlease
- COVERAGE=YesPlease
endif
# Profile
@@ -781,12 +771,10 @@
ifneq (,$(filter profile,$(MAKECMDGOALS)))
FULLDEBUG=YesPlease
DEBUG=YesPlease
- COVERAGE=YesPlease
endif
# Unit tests
ifneq (,$(filter catch2-tests,$(MAKECMDGOALS)))
- COVERAGE=YesPlease
endif
ifdef HURRY
@@ -938,7 +926,7 @@
INSTALL_FONTS += "$(PROPORTIONAL_FONT)"
endif
else
- SYS_PROPORTIONAL_FONT = $(shell util/find_font "$(OUR_PROPORTIONAL_FONT)")
+ SYS_PROPORTIONAL_FONT = /usr/share/fonts/dejavu/DejaVuSans.ttf
ifneq (,$(SYS_PROPORTIONAL_FONT))
ifeq (,$(COPY_FONTS))
DEFINES += -DPROPORTIONAL_FONT=\"$(SYS_PROPORTIONAL_FONT)\"
@@ -958,7 +946,7 @@
INSTALL_FONTS += "$(MONOSPACED_FONT)"
endif
else
- SYS_MONOSPACED_FONT = $(shell util/find_font "$(OUR_MONOSPACED_FONT)")
+ SYS_MONOSPACED_FONT = /usr/share/fonts/dejavu/DejaVuSansMono.ttf
ifneq (,$(SYS_MONOSPACED_FONT))
ifeq (,$(COPY_FONTS))
DEFINES += -DMONOSPACED_FONT=\"$(SYS_MONOSPACED_FONT)\"
@@ -1187,9 +1175,8 @@
LANGUAGES = $(filter-out en, $(notdir $(wildcard dat/descript/??)))
SRC_PKG_BASE := stone_soup
-SRC_VERSION := $(shell git describe --tags $(MERGE_BASE) 2>/dev/null || cat util/release_ver)
+SRC_VERSION := $(shell cat util/release_ver)
MAJOR_VERSION = $(shell echo "$(SRC_VERSION)"|$(SED) -r 's/-.*//;s/^([^.]+\.[^.]+).*/\1/')
-RECENT_TAG := $(shell git describe --abbrev=0 --tags $(MERGE_BASE))
WINARCH := $(shell $(GXX) -dumpmachine | grep -q x64_64 && echo win64 || echo win32)
export SRC_VERSION
@@ -1523,7 +1510,7 @@
endif
endif
-install: all install-data
+install: install-data
[ -d $(prefix_fp)/$(bin_prefix) ] || mkdir -p $(prefix_fp)/$(bin_prefix)
$(COPY) $(GAME) $(prefix_fp)/$(bin_prefix)/
$(STRIP) $(prefix_fp)/$(bin_prefix)/$(GAME)
|
GitWeb