Skip to content

Commit a01cd44

Browse files
flipcoderflipcoder
committed
fixed compilation on arch linux, fixed compile script
1 parent 65cebed commit a01cd44

File tree

5 files changed

+171
-170
lines changed

5 files changed

+171
-170
lines changed

‎next.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
22
clear
3-
premake4 vs2010 2> /dev/null > /dev/null
4-
premake4 gmake 2> /dev/null > /dev/null
3+
#premake4 vs2010 2> /dev/null > /dev/null
4+
#premake4 gmake 2> /dev/null > /dev/null
55
make 2>&1 | grep -m1 error

‎premake4.lua

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,17 @@ solution("qor")
4747
"src/mod_**"
4848
}
4949

50-
if (linux) then
50+
configuration { "linux" }
5151
includedirs {
5252
"/usr/include/freetype2/",
53-
"/usr/local/include/bullet/"
53+
"/usr/include/bullet/"
5454
}
55-
end
55+
configuration {}
5656

5757
includedirs {"third_party/include/"}
5858
libdirs {"third_party/lib/"}
5959

6060
configuration { "gmake" }
6161
buildoptions { "-std=c++0x" }
62+
configuration {}
6263

‎qor.make

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ ifeq ($(config),debug)
2424
TARGETDIR = bin
2525
TARGET = $(TARGETDIR)/qor
2626
DEFINES += -DDEBUG
27-
INCLUDES += -Ithird_party/include
27+
INCLUDES += -I/usr/include/freetype2 -I/usr/include/bullet -Ithird_party/include
2828
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
2929
CFLAGS += $(CPPFLAGS) $(ARCH) -g -std=c++0x
3030
CXXFLAGS += $(CFLAGS)
@@ -46,7 +46,7 @@ ifeq ($(config),release)
4646
TARGETDIR = bin
4747
TARGET = $(TARGETDIR)/qor
4848
DEFINES += -DNDEBUG
49-
INCLUDES += -Ithird_party/include
49+
INCLUDES += -I/usr/include/freetype2 -I/usr/include/bullet -Ithird_party/include
5050
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
5151
CFLAGS += $(CPPFLAGS) $(ARCH) -O2 -std=c++0x
5252
CXXFLAGS += $(CFLAGS)
@@ -64,49 +64,49 @@ ifeq ($(config),release)
6464
endif
6565

6666
OBJECTS := \
67-
$(OBJDIR)/Freq.o \
67+
$(OBJDIR)/Shadow.o \
6868
$(OBJDIR)/Filesystem.o \
69-
$(OBJDIR)/Entity.o \
70-
$(OBJDIR)/Frustum.o \
71-
$(OBJDIR)/Physics.o \
72-
$(OBJDIR)/Engine.o \
73-
$(OBJDIR)/IPhysicsObject.o \
74-
$(OBJDIR)/Shader.o \
75-
$(OBJDIR)/ParticleSystem.o \
69+
$(OBJDIR)/NodeFactory.o \
7670
$(OBJDIR)/Scene.o \
77-
$(OBJDIR)/Input.o \
7871
$(OBJDIR)/EnvironmentNode.o \
79-
$(OBJDIR)/Developer.o \
80-
$(OBJDIR)/Spectator.o \
72+
$(OBJDIR)/Console.o \
8173
$(OBJDIR)/Mesh.o \
74+
$(OBJDIR)/DumbyPartitioner.o \
75+
$(OBJDIR)/Material.o \
8276
$(OBJDIR)/Main.o \
83-
$(OBJDIR)/Texture.o \
77+
$(OBJDIR)/Engine.o \
78+
$(OBJDIR)/TrackerNode.o \
79+
$(OBJDIR)/Entity.o \
80+
$(OBJDIR)/Renderer.o \
8481
$(OBJDIR)/Path.o \
85-
$(OBJDIR)/Console.o \
86-
$(OBJDIR)/Log.o \
82+
$(OBJDIR)/Frustum.o \
83+
$(OBJDIR)/Spectator.o \
84+
$(OBJDIR)/Freq.o \
8785
$(OBJDIR)/PropertyList.o \
86+
$(OBJDIR)/Physics.o \
8887
$(OBJDIR)/Node.o \
89-
$(OBJDIR)/GUI.o \
90-
$(OBJDIR)/Renderer.o \
88+
$(OBJDIR)/Settings.o \
89+
$(OBJDIR)/Developer.o \
9190
$(OBJDIR)/Graphics.o \
91+
$(OBJDIR)/Log.o \
92+
$(OBJDIR)/Batch.o \
93+
$(OBJDIR)/ParticleSystem.o \
94+
$(OBJDIR)/Texture.o \
9295
$(OBJDIR)/Actor.o \
93-
$(OBJDIR)/Material.o \
96+
$(OBJDIR)/Shader.o \
9497
$(OBJDIR)/Audio.o \
95-
$(OBJDIR)/TrackerNode.o \
96-
$(OBJDIR)/DumbyPartitioner.o \
98+
$(OBJDIR)/IPhysicsObject.o \
99+
$(OBJDIR)/GUI.o \
100+
$(OBJDIR)/Input.o \
97101
$(OBJDIR)/EulerNode.o \
98-
$(OBJDIR)/Settings.o \
99-
$(OBJDIR)/Batch.o \
100-
$(OBJDIR)/Shadow.o \
101-
$(OBJDIR)/NodeFactory.o \
102102
$(OBJDIR)/GameState.o \
103+
$(OBJDIR)/pn.o \
104+
$(OBJDIR)/pnUtil.o \
103105
$(OBJDIR)/pnSocket.o \
104106
$(OBJDIR)/pnBuffer.o \
105-
$(OBJDIR)/pnUtil.o \
106-
$(OBJDIR)/pn.o \
107-
$(OBJDIR)/matrixstack.o \
108-
$(OBJDIR)/EditorState.o \
109107
$(OBJDIR)/SelectorNode.o \
108+
$(OBJDIR)/EditorState.o \
109+
$(OBJDIR)/matrixstack.o \
110110

111111
RESOURCES := \
112112

@@ -167,133 +167,133 @@ $(GCH): $(PCH)
167167
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
168168
endif
169169

170-
$(OBJDIR)/Freq.o: src/Freq.cpp
170+
$(OBJDIR)/Shadow.o: src/Shadow.cpp
171171
@echo $(notdir $<)
172172
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
173173
$(OBJDIR)/Filesystem.o: src/Filesystem.cpp
174174
@echo $(notdir $<)
175175
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
176-
$(OBJDIR)/Entity.o: src/Entity.cpp
177-
@echo $(notdir $<)
178-
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
179-
$(OBJDIR)/Frustum.o: src/Frustum.cpp
176+
$(OBJDIR)/NodeFactory.o: src/NodeFactory.cpp
180177
@echo $(notdir $<)
181178
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
182-
$(OBJDIR)/Physics.o: src/Physics.cpp
179+
$(OBJDIR)/Scene.o: src/Scene.cpp
183180
@echo $(notdir $<)
184181
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
185-
$(OBJDIR)/Engine.o: src/Engine.cpp
182+
$(OBJDIR)/EnvironmentNode.o: src/EnvironmentNode.cpp
186183
@echo $(notdir $<)
187184
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
188-
$(OBJDIR)/IPhysicsObject.o: src/IPhysicsObject.cpp
185+
$(OBJDIR)/Console.o: src/Console.cpp
189186
@echo $(notdir $<)
190187
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
191-
$(OBJDIR)/Shader.o: src/Shader.cpp
188+
$(OBJDIR)/Mesh.o: src/Mesh.cpp
192189
@echo $(notdir $<)
193190
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
194-
$(OBJDIR)/ParticleSystem.o: src/ParticleSystem.cpp
191+
$(OBJDIR)/DumbyPartitioner.o: src/DumbyPartitioner.cpp
195192
@echo $(notdir $<)
196193
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
197-
$(OBJDIR)/Scene.o: src/Scene.cpp
194+
$(OBJDIR)/Material.o: src/Material.cpp
198195
@echo $(notdir $<)
199196
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
200-
$(OBJDIR)/Input.o: src/Input.cpp
197+
$(OBJDIR)/Main.o: src/Main.cpp
201198
@echo $(notdir $<)
202199
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
203-
$(OBJDIR)/EnvironmentNode.o: src/EnvironmentNode.cpp
200+
$(OBJDIR)/Engine.o: src/Engine.cpp
204201
@echo $(notdir $<)
205202
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
206-
$(OBJDIR)/Developer.o: src/Developer.cpp
203+
$(OBJDIR)/TrackerNode.o: src/TrackerNode.cpp
207204
@echo $(notdir $<)
208205
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
209-
$(OBJDIR)/Spectator.o: src/Spectator.cpp
206+
$(OBJDIR)/Entity.o: src/Entity.cpp
210207
@echo $(notdir $<)
211208
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
212-
$(OBJDIR)/Mesh.o: src/Mesh.cpp
209+
$(OBJDIR)/Renderer.o: src/Renderer.cpp
213210
@echo $(notdir $<)
214211
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
215-
$(OBJDIR)/Main.o: src/Main.cpp
212+
$(OBJDIR)/Path.o: src/Path.cpp
216213
@echo $(notdir $<)
217214
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
218-
$(OBJDIR)/Texture.o: src/Texture.cpp
215+
$(OBJDIR)/Frustum.o: src/Frustum.cpp
219216
@echo $(notdir $<)
220217
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
221-
$(OBJDIR)/Path.o: src/Path.cpp
218+
$(OBJDIR)/Spectator.o: src/Spectator.cpp
222219
@echo $(notdir $<)
223220
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
224-
$(OBJDIR)/Console.o: src/Console.cpp
221+
$(OBJDIR)/Freq.o: src/Freq.cpp
225222
@echo $(notdir $<)
226223
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
227-
$(OBJDIR)/Log.o: src/Log.cpp
224+
$(OBJDIR)/PropertyList.o: src/PropertyList.cpp
228225
@echo $(notdir $<)
229226
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
230-
$(OBJDIR)/PropertyList.o: src/PropertyList.cpp
227+
$(OBJDIR)/Physics.o: src/Physics.cpp
231228
@echo $(notdir $<)
232229
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
233230
$(OBJDIR)/Node.o: src/Node.cpp
234231
@echo $(notdir $<)
235232
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
236-
$(OBJDIR)/GUI.o: src/GUI.cpp
233+
$(OBJDIR)/Settings.o: src/Settings.cpp
237234
@echo $(notdir $<)
238235
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
239-
$(OBJDIR)/Renderer.o: src/Renderer.cpp
236+
$(OBJDIR)/Developer.o: src/Developer.cpp
240237
@echo $(notdir $<)
241238
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
242239
$(OBJDIR)/Graphics.o: src/Graphics.cpp
243240
@echo $(notdir $<)
244241
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
245-
$(OBJDIR)/Actor.o: src/Actor.cpp
242+
$(OBJDIR)/Log.o: src/Log.cpp
246243
@echo $(notdir $<)
247244
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
248-
$(OBJDIR)/Material.o: src/Material.cpp
245+
$(OBJDIR)/Batch.o: src/Batch.cpp
249246
@echo $(notdir $<)
250247
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
251-
$(OBJDIR)/Audio.o: src/Audio.cpp
248+
$(OBJDIR)/ParticleSystem.o: src/ParticleSystem.cpp
252249
@echo $(notdir $<)
253250
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
254-
$(OBJDIR)/TrackerNode.o: src/TrackerNode.cpp
251+
$(OBJDIR)/Texture.o: src/Texture.cpp
255252
@echo $(notdir $<)
256253
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
257-
$(OBJDIR)/DumbyPartitioner.o: src/DumbyPartitioner.cpp
254+
$(OBJDIR)/Actor.o: src/Actor.cpp
258255
@echo $(notdir $<)
259256
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
260-
$(OBJDIR)/EulerNode.o: src/EulerNode.cpp
257+
$(OBJDIR)/Shader.o: src/Shader.cpp
261258
@echo $(notdir $<)
262259
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
263-
$(OBJDIR)/Settings.o: src/Settings.cpp
260+
$(OBJDIR)/Audio.o: src/Audio.cpp
264261
@echo $(notdir $<)
265262
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
266-
$(OBJDIR)/Batch.o: src/Batch.cpp
263+
$(OBJDIR)/IPhysicsObject.o: src/IPhysicsObject.cpp
267264
@echo $(notdir $<)
268265
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
269-
$(OBJDIR)/Shadow.o: src/Shadow.cpp
266+
$(OBJDIR)/GUI.o: src/GUI.cpp
270267
@echo $(notdir $<)
271268
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
272-
$(OBJDIR)/NodeFactory.o: src/NodeFactory.cpp
269+
$(OBJDIR)/Input.o: src/Input.cpp
273270
@echo $(notdir $<)
274271
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
275-
$(OBJDIR)/GameState.o: src/game/GameState.cpp
272+
$(OBJDIR)/EulerNode.o: src/EulerNode.cpp
276273
@echo $(notdir $<)
277274
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
278-
$(OBJDIR)/pnSocket.o: src/pn/pnSocket.cpp
275+
$(OBJDIR)/GameState.o: src/game/GameState.cpp
279276
@echo $(notdir $<)
280277
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
281-
$(OBJDIR)/pnBuffer.o: src/pn/pnBuffer.cpp
278+
$(OBJDIR)/pn.o: src/pn/pn.cpp
282279
@echo $(notdir $<)
283280
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
284281
$(OBJDIR)/pnUtil.o: src/pn/pnUtil.cpp
285282
@echo $(notdir $<)
286283
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
287-
$(OBJDIR)/pn.o: src/pn/pn.cpp
284+
$(OBJDIR)/pnSocket.o: src/pn/pnSocket.cpp
288285
@echo $(notdir $<)
289286
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
290-
$(OBJDIR)/matrixstack.o: src/math/matrixstack.cpp
287+
$(OBJDIR)/pnBuffer.o: src/pn/pnBuffer.cpp
288+
@echo $(notdir $<)
289+
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
290+
$(OBJDIR)/SelectorNode.o: src/editor/SelectorNode.cpp
291291
@echo $(notdir $<)
292292
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
293293
$(OBJDIR)/EditorState.o: src/editor/EditorState.cpp
294294
@echo $(notdir $<)
295295
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
296-
$(OBJDIR)/SelectorNode.o: src/editor/SelectorNode.cpp
296+
$(OBJDIR)/matrixstack.o: src/math/matrixstack.cpp
297297
@echo $(notdir $<)
298298
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
299299

0 commit comments

Comments
 (0)