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.6-build.patch
Date: Wed, 03 Jun 2009 19:07:34
Message-Id: E1MBvoB-0004hP-Di@stork.gentoo.org
1 mr_bones_ 09/06/03 19:07:31
2
3 Added: atanks-3.6-build.patch
4 Log:
5 version bump
6 (Portage version: 2.1.6.11/cvs/Linux i686)
7
8 Revision Changes Path
9 1.1 games-action/atanks/files/atanks-3.6-build.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/atanks/files/atanks-3.6-build.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/games-action/atanks/files/atanks-3.6-build.patch?rev=1.1&content-type=text/plain
13
14 Index: atanks-3.6-build.patch
15 ===================================================================
16 diff -ru atanks-3.6.orig/src/Makefile atanks-3.6/src/Makefile
17 --- atanks-3.6.orig/src/Makefile 2009-05-23 12:31:01.000000000 -0400
18 +++ atanks-3.6/src/Makefile 2009-06-03 13:37:14.000000000 -0400
19 @@ -3,9 +3,6 @@
20 MODULES = atanks.o beam.o button.o environment.o explosion.o fade.o files.o globaldata.o \
21 missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o
22
23 -CPP=g++
24 -CC=gcc
25 -LD=g++
26 LIB=ar
27 WINDRES=
28 # FLAGS += -DDATA_DIR=\".\"
29 @@ -14,10 +11,10 @@
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 -# CFLAGS += -g # debug vs optimize flags
38 +CXXFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage
39 +# CXXFLAGS += -g # debug vs optimize flags
40 # No, let the user decide!
41
42 SRCS = $(MODULES:.o=.cpp)
43 @@ -34,65 +31,65 @@
44 $(MODULES): Makefile
45
46 atanks.o: atanks.cpp
47 - $(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
48 + $(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
49
50 button.o: button.cpp
51 - $(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
52 + $(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
53
54 environment.o: environment.cpp
55 - $(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
56 + $(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
57
58 explosion.o: explosion.cpp
59 - $(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
60 + $(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
61
62 files.o: files.cpp
63 - $(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
64 + $(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
65
66 # No longer needed, as floattext is fully inline now!
67 # floattext.o:
68 -# $(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
69 +# $(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
70
71 globaldata.o: globaldata.cpp
72 - $(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
73 + $(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
74
75 missile.o: missile.cpp
76 - $(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
77 + $(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
78
79 teleport.o: teleport.cpp
80 - $(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
81 + $(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
82
83 physobj.o: physobj.cpp
84 - $(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
85 + $(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
86
87 player.o: player.cpp
88 - $(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
89 + $(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
90
91 tank.o: tank.cpp
92 - $(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
93 + $(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
94
95 team.o: team.cpp
96 - $(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
97 + $(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
98
99 virtobj.o: virtobj.cpp
100 - $(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
101 + $(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
102
103 fade.o: fade.cpp
104 - $(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
105 + $(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
106
107 perlin.o: perlin.cpp
108 - $(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
109 + $(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
110
111 sky.o: sky.cpp
112 - $(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
113 + $(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
114
115 satellite.o: satellite.cpp
116 - $(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
117 + $(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
118
119 %.o: %.cpp %.h
120 - $(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
121 + $(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
122
123 $(OUTPUT): $(OBJECTS) $(MODULES)
124 - $(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
125 + $(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
126 # strip $(OUTPUT)
127
128 # dependencies: