Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-action/atanks/files: atanks-3.5-build.patch
Date: Mon, 04 May 2009 08:10:57
Message-Id: E1M0lbv-0008Ha-AB@stork.gentoo.org
1 mr_bones_ 09/05/04 00:00:43
2
3 Added: atanks-3.5-build.patch
4 Log:
5 version bump (bug #267097)
6 (Portage version: 2.1.6.11/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-action/atanks/files/atanks-3.5-build.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/atanks/files/atanks-3.5-build.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/atanks/files/atanks-3.5-build.patch?rev=1.1&content-type=text/plain
13
14 Index: atanks-3.5-build.patch
15 ===================================================================
16 diff -ru atanks-3.5-r1.orig/Makefile atanks-3.5-r1/Makefile
17 --- atanks-3.5-r1.orig/Makefile 2009-03-25 04:39:23.000000000 -0400
18 +++ atanks-3.5-r1/Makefile 2009-05-03 19:40:02.000000000 -0400
19 @@ -4,7 +4,7 @@
20 BINPREFIX = $(PREFIX)
21
22 BINDIR = ${BINPREFIX}games/bin/
23 -INSTALLDIR = ${PREFIX}share/games/atanks
24 +INSTALLDIR = ${PREFIX}share/games/atanks
25
26 export VERSION
27 export PREFIX
28 diff -ru atanks-3.5-r1.orig/src/Makefile atanks-3.5-r1/src/Makefile
29 --- atanks-3.5-r1.orig/src/Makefile 2009-03-23 04:58:36.000000000 -0400
30 +++ atanks-3.5-r1/src/Makefile 2009-05-03 19:41:56.000000000 -0400
31 @@ -3,9 +3,6 @@
32 MODULES = atanks.o beam.o button.o environment.o explosion.o fade.o files.o globaldata.o \
33 missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o
34
35 -CPP=g++
36 -CC=gcc
37 -LD=g++
38 LIB=ar
39 WINDRES=
40 FLAGS += -DDATA_DIR=\"${INSTALLDIR}\"
41 @@ -13,10 +10,10 @@
42 WFLAGS =
43 OFLAGS =
44 LFLAGS +=
45 -LDFLAGS = `allegro-config --libs`
46 +LDFLAGS += `allegro-config --libs`
47
48 -CFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage
49 -# CFLAGS += -g # debug vs optimize flags
50 +CXXFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage
51 +# CXXFLAGS += -g # debug vs optimize flags
52 # No, let the user decide!
53
54 SRCS = $(MODULES:.o=.cpp)
55 @@ -33,65 +30,65 @@
56 $(MODULES): Makefile
57
58 atanks.o:
59 - $(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
60 + $(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
61
62 button.o:
63 - $(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
64 + $(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
65
66 environment.o:
67 - $(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
68 + $(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
69
70 explosion.o:
71 - $(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
72 + $(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
73
74 files.o:
75 - $(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
76 + $(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
77
78 # No longer needed, as floattext is fully inline now!
79 # floattext.o:
80 -# $(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
81 +# $(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
82
83 globaldata.o:
84 - $(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
85 + $(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
86
87 missile.o:
88 - $(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
89 + $(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
90
91 teleport.o:
92 - $(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
93 + $(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
94
95 physobj.o:
96 - $(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
97 + $(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
98
99 player.o:
100 - $(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
101 + $(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
102
103 tank.o:
104 - $(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
105 + $(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
106
107 team.o:
108 - $(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
109 + $(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
110
111 virtobj.o:
112 - $(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
113 + $(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
114
115 fade.o:
116 - $(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
117 + $(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
118
119 perlin.o:
120 - $(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
121 + $(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
122
123 sky.o:
124 - $(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
125 + $(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
126
127 satellite.o:
128 - $(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
129 + $(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
130
131 %.o: %.cpp %.h
132 - $(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
133 + $(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
134
135 $(OUTPUT): $(OBJECTS) $(MODULES)
136 - $(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS)
137 + $(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS)
138 # strip $(OUTPUT)
139
140 # dependencies: