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-4.6-build.patch
Date: Wed, 02 Jun 2010 07:29:48
Message-Id: 20100602072942.ECA022C3ED@corvid.gentoo.org
1 mr_bones_ 10/06/02 07:29:42
2
3 Added: atanks-4.6-build.patch
4 Log:
5 version bump
6 (Portage version: 2.1.8.3/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-action/atanks/files/atanks-4.6-build.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/atanks/files/atanks-4.6-build.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-action/atanks/files/atanks-4.6-build.patch?rev=1.1&content-type=text/plain
13
14 Index: atanks-4.6-build.patch
15 ===================================================================
16 diff -ru atanks-4.6.orig/src/Makefile atanks-4.6/src/Makefile
17 --- atanks-4.6.orig/src/Makefile 2010-05-24 12:30:23.000000000 -0400
18 +++ atanks-4.6/src/Makefile 2010-06-02 03:22:25.112064819 -0400
19 @@ -4,9 +4,6 @@
20 missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
21 update.o network.o floattext.o land.o text.o client.o gameloop.o
22
23 -CPP=g++
24 -CC=gcc
25 -LD=g++
26 LIB=ar
27 WINDRES=
28 # FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
29 @@ -15,9 +12,9 @@
30 WFLAGS =
31 OFLAGS =
32 LFLAGS +=
33 -LDFLAGS = `allegro-config --libs`
34 +LDFLAGS += `allegro-config --libs`
35
36 -CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage
37 +CXXFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage
38
39 SRCS = $(MODULES:.o=.cpp)
40 GLOBALS = main.h imagedefs.h externs.h
41 @@ -33,82 +30,82 @@
42 $(MODULES): Makefile
43
44 atanks.o: atanks.cpp globals.h main.h menucontent.h
45 - $(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
46 + $(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
47
48 button.o: button.cpp button.h
49 - $(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
50 + $(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
51
52 client.o: client.h client.cpp
53 - $(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
54 + $(CXX) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CXXFLAGS)
55
56 environment.o: environment.cpp environment.h
57 - $(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
58 + $(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
59
60 explosion.o: explosion.cpp explosion.h
61 - $(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
62 + $(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
63
64 files.o: files.cpp files.h text.h text.cpp
65 - $(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
66 + $(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
67
68 floattext.o: floattext.cpp floattext.h
69 - $(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
70 + $(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
71
72 gameloop.o: gameloop.cpp atanks.cpp main.h
73 - $(CPP) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
74 + $(CXX) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
75
76 globaldata.o: globaldata.cpp globaldata.h
77 - $(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
78 + $(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
79
80 land.o: land.cpp land.h globaldata.h environment.h
81 - $(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
82 + $(CXX) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
83
84 missile.o: missile.cpp missile.h
85 - $(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
86 + $(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
87
88 teleport.o: teleport.cpp teleport.h
89 - $(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
90 + $(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
91
92 physobj.o: physobj.cpp physobj.h
93 - $(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
94 + $(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
95
96 player.o: player.cpp player.h
97 - $(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
98 + $(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
99
100 tank.o: tank.cpp tank.h
101 - $(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
102 + $(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
103
104 team.o: team.cpp team.h
105 - $(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
106 + $(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
107
108 virtobj.o: virtobj.cpp virtobj.h
109 - $(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
110 + $(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
111
112 fade.o: fade.cpp
113 - $(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
114 + $(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
115
116 perlin.o: perlin.cpp
117 - $(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
118 + $(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
119
120 sky.o: sky.cpp sky.h
121 - $(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
122 + $(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
123
124 satellite.o: satellite.cpp satellite.h
125 - $(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
126 + $(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
127
128 text.o: text.cpp text.h
129 - $(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
130 + $(CXX) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
131
132 update.o: update.cpp update.h
133 - $(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
134 + $(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
135
136 network.o: network.cpp network.h
137 - $(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
138 + $(CXX) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
139
140 %.o: %.cpp %.h
141 - $(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
142 + $(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
143
144 $(OUTPUT): $(OBJECTS) $(MODULES)
145 - $(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
146 + $(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
147 # strip $(OUTPUT)
148
149 # dependencies: