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
|
From 0f93097a58d78e0ba9d51d48f56b470047b27210 Mon Sep 17 00:00:00 2001
From: Stefan Strogin <steils@gentoo.org>
Date: Fri, 5 Jun 2020 07:19:47 +0300
Subject: [PATCH] Respect {C,CXX,LD}FLAGS
Upstream-Status: Inappropriate [Gentoo-specific]
Signed-off-by: Stefan Strogin <steils@gentoo.org>
---
Makefile.linux | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile.linux b/Makefile.linux
index eb57e0e..c9bbc73 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -17,11 +17,11 @@ OPTIONS = -DLINUX -DELC $(foreach FEATURE, $(FEATURES), -D$(FEATURE)) -D_7ZIP_ST
$(shell pkg-config vorbisfile --cflags) \
$(shell pkg-config zlib --cflags)
-CFLAGS=$(PLATFORM) $(CWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+CFLAGS += -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
-CXXFLAGS=$(PLATFORM) $(CXXWARN) -O0 -ggdb -pipe $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
+CXXFLAGS += $(OPTIONS) -fno-strict-aliasing $(EXTRA_INCLUDES)
-LDFLAGS=$(shell pkg-config sdl2 --libs) \
+LDFLAGS += $(shell pkg-config sdl2 --libs) \
$(shell pkg-config libxml-2.0 --libs) \
$(shell pkg-config SDL2_net --libs) \
$(shell pkg-config SDL2_image --libs) \
@@ -112,7 +112,7 @@ HEADER_DIRS = . books eye_candy io pawn fsaa engine xz
DEP_FILES=$(foreach OBJ, $(COBJS), .deps/$(OBJ).P) $(foreach OBJ, $(CXXOBJS), .deps/$(OBJ).P)
#(shell echo $OBJ |sed s/\.o/\.P/))
-EXE=el.x86.linux.bin
+EXE=el.linux.bin
ifndef CC
CC=gcc
@@ -128,8 +128,8 @@ all: $(EXE)
# the compile targets
$(EXE): $(OBJS)
- @echo " LINK $(EXE)"
- @$(LINK) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
+ @echo "$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)"
+ @$(CC) $(CFLAGS) -o $(EXE) $(OBJS) $(LDFLAGS)
#recompile on Makefile or conf change
#.depend $(OBJS): Makefile.linux make.conf
@@ -137,14 +137,14 @@ $(EXE): $(OBJS)
DEPS_MAGIC := $(shell mkdir .deps .deps/io .deps/shader .deps/eye_candy .deps/exceptions .deps/xz .deps/xml .deps/fsaa .deps/engine > /dev/null 2>&1 || :)
$(COBJS): %.o: %.c Makefile.linux make.conf
- @echo " CC $@"
+ @echo "$(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
@if $(CC) $(CFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
mv ".deps/$@.pp" ".deps/$@.P"; \
else rm -f ".deps/$@.pp"; exit 1; \
fi
$(CXXOBJS): %.o: %.cpp Makefile.linux make.conf
- @echo " CXX $@"
+ @echo "$(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@"
@if $(CXX) $(CXXFLAGS) -MT '$@' -MD -MP -MF '.deps/$@.pp' -c $< -o $@; then \
mv ".deps/$@.pp" ".deps/$@.P"; \
else rm -f ".deps/$@.pp"; exit 1; \
--
2.27.0
|
GitWeb
