Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 263965 | Differences between
and this patch

Collapse All | Expand All

(-)polly-src.old/Makefile (-1 / +74 lines)
Lines 1-3 Link Here
1
MACHINE= $(shell uname -s)
2
3
ifeq ($(MACHINE),Darwin)
1
CXXFLAGS = \
4
CXXFLAGS = \
2
	-O2 \
5
	-O2 \
3
	-I/System/Library/Frameworks/GLUT.framework/Headers \
6
	-I/System/Library/Frameworks/GLUT.framework/Headers \
Lines 25-31 Link Here
25
	resources/*.vert \
28
	resources/*.vert \
26
	resources/world.xml
29
	resources/world.xml
27
30
31
else
32
LIBS = \
33
	`sdl-config --cflags` \
34
	-I/usr/include \
35
	-lGLU \
36
	-lGL \
37
	-lGLEW \
38
	-lglut \
39
	-lSDL \
40
	-lSDL_image \
41
	-lSDL_mixer \
42
	-ltinyxml
43
44
endif
45
46
ifeq ($(MACHINE),Darwin)
28
all : obj/Polly-B-Gone.app
47
all : obj/Polly-B-Gone.app
48
else
49
all : obj/polly-b-gone
50
endif
51
52
ifeq ($(MACHINE),Darwin)
29
53
30
obj/main.out : \
54
obj/main.out : \
31
	obj/ball.o \
55
	obj/ball.o \
Lines 66-71 Link Here
66
	obj/worlds.o \
90
	obj/worlds.o \
67
	SDLMain.m
91
	SDLMain.m
68
92
93
else
94
95
obj/main.out : \
96
	obj/ball.o \
97
	obj/block.o \
98
	obj/escalator.o \
99
	obj/fan.o \
100
	obj/lighting.o \
101
	obj/material.o \
102
	obj/model.o \
103
	obj/physics/constraint.o \
104
	obj/physics/force.o \
105
	obj/physics/particle.o \
106
	obj/physics/rotation.o \
107
	obj/physics/shape.o \
108
	obj/physics/transform.o \
109
	obj/physics/translation.o \
110
	obj/physics/vector.o \
111
	obj/player.o \
112
	obj/portal.o \
113
	obj/ramp.o \
114
	obj/resource.o \
115
	obj/room.o \
116
	obj/room_force.o \
117
	obj/room_object.o \
118
	obj/rotating.o \
119
	obj/seesaw.o \
120
	obj/shader.o \
121
	obj/simulation.o \
122
	obj/sound.o \
123
	obj/switch.o \
124
	obj/texture.o \
125
	obj/trail.o \
126
	obj/transforming.o \
127
	obj/translating.o \
128
	obj/tube.o \
129
	obj/wall.o \
130
	obj/world.o \
131
	obj/worlds.o 
132
133
endif
134
69
obj/physics/particle_test.out : \
135
obj/physics/particle_test.out : \
70
	obj/physics/force.o \
136
	obj/physics/force.o \
71
	obj/physics/particle.o \
137
	obj/physics/particle.o \
Lines 79-84 Link Here
79
obj/physics/vector_test.out : \
145
obj/physics/vector_test.out : \
80
	obj/physics/vector.o
146
	obj/physics/vector.o
81
147
148
ifeq ($(MACHINE),Darwin)
149
82
obj/Polly-B-Gone.app : obj/main.out $(RESOURCES) resources/Info.plist Makefile
150
obj/Polly-B-Gone.app : obj/main.out $(RESOURCES) resources/Info.plist Makefile
83
	rm -rf $@
151
	rm -rf $@
84
	mkdir -p $@/Contents/MacOS
152
	mkdir -p $@/Contents/MacOS
Lines 94-99 Link Here
94
	find $@/Contents/Frameworks -name Headers | xargs rm -r
162
	find $@/Contents/Frameworks -name Headers | xargs rm -r
95
#	ln -sf ../../../../resources/world.xml $@/Contents/Resources/world.xml
163
#	ln -sf ../../../../resources/world.xml $@/Contents/Resources/world.xml
96
164
165
else
166
obj/polly-b-gone : obj/main.out
167
	mv obj/main.out polly-b-gone
168
endif
169
97
physics/%.run : obj/physics/%.out
170
physics/%.run : obj/physics/%.out
98
	./$<
171
	./$<
99
172
Lines 101-107 Link Here
101
	./$<
174
	./$<
102
175
103
obj/%.out : obj/%.o
176
obj/%.out : obj/%.o
104
	$(CXX) $(LDFLAGS) -o $@ $^
177
	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
105
178
106
obj/%.o : %.cpp
179
obj/%.o : %.cpp
107
	mkdir -p $(@D)
180
	mkdir -p $(@D)

Return to bug 263965