1 |
hasufell 14/09/23 15:37:10 |
2 |
|
3 |
Added: stone-soup-0.15.1-build.patch |
4 |
Removed: stone-soup-0.13.1-build.patch |
5 |
stone-soup-0.15.0-build.patch |
6 |
Log: |
7 |
version bump, rm old |
8 |
|
9 |
(Portage version: 2.2.12-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-roguelike/stone-soup/files/stone-soup-0.15.1-build.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: stone-soup-0.15.1-build.patch |
18 |
=================================================================== |
19 |
From: Julian Ospald <hasufell@g.o> |
20 |
Date: Fri Oct 5 13:55:07 UTC 2012 |
21 |
Subject: build system |
22 |
|
23 |
respect flags and compiler |
24 |
|
25 |
--- a/source/Makefile |
26 |
+++ b/source/Makefile |
27 |
@@ -101,7 +101,7 @@ include Makefile.obj |
28 |
# |
29 |
|
30 |
|
31 |
-CFOTHERS := -pipe $(EXTERNAL_FLAGS) |
32 |
+CFOTHERS := $(EXTERNAL_FLAGS) |
33 |
CFWARN := -Wall -Wformat-security |
34 |
CFWARN_L := -Wundef |
35 |
|
36 |
@@ -747,7 +747,6 @@ ifdef FULLDEBUG |
37 |
DEFINES += -DFULLDEBUG |
38 |
endif |
39 |
ifdef DEBUG |
40 |
-CFOTHERS := -ggdb $(CFOTHERS) |
41 |
DEFINES += -DDEBUG |
42 |
endif |
43 |
ifndef NOWIZARD |
44 |
@@ -1513,7 +1512,7 @@ ifdef ANDROID |
45 |
# prove that tiles were generated properly |
46 |
grep tile_info rltiles/*.cc| head |
47 |
else |
48 |
- +$(MAKE) -C $(RLTILES) all ARCH=$(ARCH) TILES=$(TILES)$(WEBTILES) |
49 |
+ +$(MAKE) -C $(RLTILES) all V=$(V) ARCH=$(ARCH) DEBUG=$(DEBUG) TILES=$(TILES)$(WEBTILES) |
50 |
endif |
51 |
|
52 |
$(TILEDEFSRCS) $(TILEDEFHDRS) $(ORIGTILEFILES): build-rltiles |
53 |
--- a/source/rltiles/Makefile |
54 |
+++ b/source/rltiles/Makefile |
55 |
@@ -1,7 +1,7 @@ |
56 |
uname_S := $(shell uname -s) |
57 |
|
58 |
ifneq (,$(findstring MINGW,$(uname_S))) |
59 |
-LDFLAGS += -lmingw32 |
60 |
+LIBS += -lmingw32 |
61 |
endif |
62 |
|
63 |
# Note: since generation of tiles is done on the host, we don't care about |
64 |
@@ -10,7 +10,7 @@ endif |
65 |
# Also, cross-compilation with no system libraries for host rather than target |
66 |
# is not supported. If host=target, contribs are enough. |
67 |
|
68 |
-CFLAGS := -O2 -g -Wall -Wextra -Wno-parentheses -Wno-unused-parameter |
69 |
+CXXFLAGS := -Wall -Wextra -Wno-parentheses -Wno-unused-parameter |
70 |
|
71 |
ifdef ANDROID |
72 |
CXXFLAGS := |
73 |
@@ -35,24 +35,24 @@ ifdef TILES |
74 |
PNG_LIB := ../contrib/install/$(ARCH)/lib/libpng.a ../contrib/install/$(ARCH)/lib/libz.a |
75 |
endif |
76 |
|
77 |
- CFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) |
78 |
- LDFLAGS += $(SDL_LDFLAGS) $(PNG_LIB) |
79 |
+ CXXFLAGS += $(SDL_CFLAGS) $(PNG_INCLUDE) |
80 |
+ LIBS += $(SDL_LDFLAGS) $(PNG_LIB) |
81 |
|
82 |
- CFLAGS += -DUSE_TILE |
83 |
+ CXXFLAGS += -DUSE_TILE |
84 |
endif |
85 |
|
86 |
ifdef DEBUG |
87 |
-CFLAGS += -O0 -DDEBUG -ggdb |
88 |
+CXXFLAGS += -DDEBUG |
89 |
endif |
90 |
|
91 |
ifneq (,$(findstring MINGW,$(uname_S))) |
92 |
-LDFLAGS += -lgdi32 -lwinmm |
93 |
+LIBS += -lgdi32 -lwinmm |
94 |
endif |
95 |
ifeq ($(uname_S),Darwin) |
96 |
LDFLAGS += -framework AppKit -framework AudioUnit -framework Carbon -framework IOKit -framework OpenGL |
97 |
endif |
98 |
ifeq ($(uname_S),Linux) |
99 |
-LDFLAGS += -ldl -lpthread |
100 |
+LIBS += -ldl -lpthread |
101 |
endif |
102 |
|
103 |
# Attempt to use a full compiler name, to make |
104 |
@@ -137,10 +137,10 @@ clean: |
105 |
|
106 |
distclean: clean |
107 |
|
108 |
-%.o: %.cc .cflags |
109 |
- $(QUIET_HOSTCXX)$(HOSTCXX) $(CFLAGS) -MMD -c $< -o $@ |
110 |
+%.o: %.cc |
111 |
+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) -c $< -o $@ |
112 |
|
113 |
$(TILEGEN): $(OBJECTS) |
114 |
- $(QUIET_HOSTLINK)$(HOSTCXX) $(OBJECTS) -o $@ $(LDFLAGS) |
115 |
+ $(QUIET_HOSTLINK)$(HOSTCXX) $(CXXFLAGS) $(OBJECTS) -o $@ $(LDFLAGS) $(LIBS) |
116 |
|
117 |
.PHONY: all clean distclean |