Skip to content

Commit 278a3a3

Browse files
flipcoderflipcoder
committed
update compilation, fixed hud
1 parent 1c5be24 commit 278a3a3

File tree

5 files changed

+173
-163
lines changed

5 files changed

+173
-163
lines changed

‎bin/profiles/default.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
"jump",
2121
"select"
2222
],
23-
"up": "aimup",
24-
"down": "aimdown",
25-
"left": "aimleft",
26-
"right": "aimright"
23+
"i": "aimup",
24+
"k": "aimdown",
25+
"j": "aimleft",
26+
"l": "aimright"
2727
}
2828
}
2929
}

‎bin/settings.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"audio" :
33
{
44
"music-volume" : 100,
5-
"sound-volume" : 10,
6-
"volume" : 50
5+
"sound-volume" : 100,
6+
"volume" : 100
77
},
88
"video" :
99
{

‎premake5.lua

Lines changed: 141 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,164 +1,77 @@
11
workspace("microarmy")
22
targetdir("bin")
3+
debugdir("bin")
34

45
configurations {"Debug", "Release"}
5-
defines {
6-
"GLM_FORCE_CTOR_INIT",
7-
"GLM_ENABLE_EXPERIMENTAL",
8-
"GLM_FORCE_RADIANS",
9-
"QOR_NO_PYTHON",
10-
"QOR_NO_CAIRO",
11-
"QOR_NO_PHYSICS",
12-
"NOMINMAX"
13-
}
14-
6+
157
-- Debug Config
168
configuration "Debug"
17-
defines { "DEBUG", "BACKWARD_HAS_BFD=1" }
9+
10+
defines {
11+
"GLM_FORCE_CTOR_INIT",
12+
"GLM_ENABLE_EXPERIMENTAL",
13+
"GLM_FORCE_RADIANS",
14+
"NOMINMAX"
15+
}
16+
1817
symbols "On"
18+
links {
19+
"z",
20+
"bfd",
21+
"iberty"
22+
}
1923
linkoptions { }
2024

21-
configuration "gmake"
22-
links {
23-
"z",
24-
"bfd",
25-
"iberty"
26-
}
27-
2825
-- Release Config
2926
configuration "Release"
3027
defines { "NDEBUG" }
31-
flags { "OptimizeSpeed" }
28+
optimize "Speed"
29+
floatingpoint "Fast"
3230
targetname("microarmy_dist")
3331

3432
-- gmake Config
3533
configuration "gmake"
3634
buildoptions { "-std=c++11" }
3735
-- Uncomment the following line to get in depth debugging
3836
-- buildoptions { "-std=c++11", "-pedantic", "-Wall", "-Wextra", '-v', '-fsyntax-only'}
39-
links {
40-
"pthread",
41-
"GL",
42-
"GLU",
43-
"SDL2_ttf",
44-
"SDL2",
45-
"GLEW",
46-
"assimp",
47-
"freeimage",
48-
"openal",
49-
"alut",
50-
"ogg",
51-
"vorbis",
52-
"vorbisfile",
53-
"boost_system",
54-
"boost_thread",
55-
"boost_filesystem",
56-
"boost_python",
57-
"boost_coroutine",
58-
"boost_regex",
59-
"jsoncpp",
60-
"z",
61-
"raknet",
62-
}
63-
includedirs {
64-
"lib/Qor/",
65-
"lib/Qor/lib/kit",
66-
"/usr/local/include/",
67-
"/usr/include/bullet/",
68-
"/usr/include/rapidxml/",
69-
"/usr/include/raknet/DependentExtensions"
70-
}
7137

72-
libdirs {
73-
"/usr/local/lib",
74-
"/usr/local/lib64/",
75-
}
76-
77-
buildoptions {
78-
"`python2-config --includes`",
79-
"`pkg-config --cflags cairomm-1.0 pangomm-1.4`"
80-
}
81-
82-
linkoptions {
83-
"`python2-config --libs`",
84-
"`pkg-config --libs cairomm-1.0 pangomm-1.4`"
85-
}
8638
-- OS X Config
8739
configuration "macosx"
8840
buildoptions { "-U__STRICT_ANSI__", "-stdlib=libc++" }
8941
linkoptions { "-stdlib=libc++" }
9042

91-
configuration "windows"
92-
toolset "v141"
93-
flags { "MultiProcessorCompile" }
94-
95-
links {
96-
"ws2_32",
97-
--"glibmm.dll",
98-
--"cairomm.dll",
99-
--"pangomm.dll",
100-
"SDL2main",
101-
"OpenGL32",
102-
"GLU32",
103-
"SDL2_ttf",
104-
"SDL2",
105-
"GLEW32",
106-
"assimp",
107-
"freeimage",
108-
"openal32",
109-
"alut",
110-
"libogg",
111-
"libvorbis",
112-
"libvorbisfile",
113-
"lib_json",
114-
}
115-
116-
includedirs {
117-
"c:/gtkmm/lib/pangomm/include",
118-
"c:/gtkmm/lib/sigc++/include",
119-
"c:/gtkmm/lib/cairomm/include",
120-
"c:/gtkmm/include/pango",
121-
"c:/gtkmm/include/pangomm",
122-
"c:/gtkmm/include/sigc++",
123-
"c:/gtkmm/include",
124-
"c:/gtkmm/include/cairo",
125-
"c:/gtkmm/lib/glib/include",
126-
"c:/gtkmm/include/glib",
127-
"c:/gtkmm/lib/glibmm/include",
128-
"c:/gtkmm/include/glibmm",
129-
"c:/gtkmm/include/cairomm",
130-
"c:/gtkmm/include",
131-
132-
"c:/local/boost_1_64_0",
133-
"c:/Program Files (x86)/OpenAL 1.1 SDK/include",
134-
"c:/msvc/include",
135-
}
136-
configuration { "windows", "Debug" }
137-
libdirs { "c:/msvc/lib32/debug" }
138-
links {
139-
"RakNet_VS2008_LibStatic_Debug_Win32",
140-
}
141-
configuration {}
142-
configuration { "windows", "Release" }
143-
links {
144-
"RakNet_VS2008_LibStatic_Release_Win32",
145-
}
146-
configuration { "windows" }
147-
148-
libdirs {
149-
"c:/Program Files (x86)/OpenAL 1.1 SDK/libs/Win32",
150-
"c:/msvc/lib32",
151-
"c:/gtkmm/lib",
152-
"c:/local/boost_1_64_0/lib32-msvc-14.1",
153-
}
154-
-- buildoptions {
155-
-- "/MP",
156-
-- "/Gm-",
157-
-- }
15843

15944
project "microarmy"
16045
kind "WindowedApp"
16146
language "C++"
47+
links {
48+
"pthread",
49+
"GL",
50+
"GLU",
51+
"SDL2",
52+
"SDL2_ttf",
53+
"GLEW",
54+
"assimp",
55+
"freeimage",
56+
"openal",
57+
"alut",
58+
"ogg",
59+
"vorbis",
60+
"vorbisfile",
61+
"boost_system",
62+
"boost_thread",
63+
"boost_filesystem",
64+
"boost_python",
65+
"boost_coroutine",
66+
"boost_regex",
67+
"jsoncpp",
68+
"BulletSoftBody",
69+
"BulletDynamics",
70+
"BulletCollision",
71+
"LinearMath",
72+
"z",
73+
"raknet",
74+
}
16275

16376
-- Project Files
16477
files {
@@ -181,11 +94,107 @@ workspace("microarmy")
18194
"lib/Qor/lib/kit/tests/**",
18295
"lib/Qor/lib/kit/toys/**"
18396
}
97+
98+
includedirs {
99+
"lib/Qor/",
100+
"lib/Qor/lib/kit",
101+
"/usr/local/include/",
102+
"/usr/include/bullet/",
103+
"/usr/include/rapidxml/",
104+
"/usr/include/raknet/DependentExtensions"
105+
}
106+
107+
libdirs {
108+
"/usr/local/lib",
109+
"/usr/local/lib64/",
110+
}
184111

112+
buildoptions {
113+
"`python2-config --includes`",
114+
"`pkg-config --cflags cairomm-1.0 pangomm-1.4`"
115+
}
116+
117+
linkoptions {
118+
"`python2-config --libs`",
119+
"`pkg-config --libs cairomm-1.0 pangomm-1.4`"
120+
}
121+
122+
project "test"
123+
kind "ConsoleApp"
124+
language "C++"
125+
links {
126+
"pthread",
127+
"GL",
128+
"GLU",
129+
"SDL2",
130+
"GLEW",
131+
"assimp",
132+
"freeimage",
133+
"openal",
134+
"alut",
135+
"ogg",
136+
"vorbis",
137+
"vorbisfile",
138+
"boost_system",
139+
"boost_thread",
140+
"boost_filesystem",
141+
"boost_python",
142+
"boost_coroutine",
143+
"boost_regex",
144+
"jsoncpp",
145+
"BulletSoftBody",
146+
"BulletDynamics",
147+
"BulletCollision",
148+
"LinearMath",
149+
"z",
150+
"RakNetDLL",
151+
}
152+
153+
-- Project Files
154+
files {
155+
"src/**.h",
156+
"src/**.cpp",
157+
"lib/Qor/Qor/**.h",
158+
"lib/Qor/Qor/**.cpp",
159+
"lib/Qor/lib/kit/**.h",
160+
"lib/Qor/lib/kit/**.cpp"
161+
}
162+
163+
-- Exluding Files
164+
excludes {
165+
"src/Main.cpp", -- run test suite instead
166+
167+
"lib/Qor/Qor/Main.cpp",
168+
"lib/Qor/Qor/Info.cpp",
169+
"lib/Qor/Qor/DemoState.*",
170+
--"lib/Qor/Qor/tests/**", -- don't exclude test suite
171+
"lib/Qor/Qor/scripts/**",
172+
"lib/Qor/Qor/addons/**",
173+
"lib/Qor/lib/kit/tests/**",
174+
"lib/Qor/lib/kit/toys/**"
175+
}
176+
185177
includedirs {
186178
"lib/Qor/",
187179
"lib/Qor/lib/kit",
188180
"/usr/local/include/",
189181
"/usr/include/bullet/",
182+
"/usr/include/rapidxml/",
190183
"/usr/include/raknet/DependentExtensions"
191184
}
185+
186+
libdirs {
187+
"/usr/local/lib",
188+
"/usr/local/lib64/",
189+
}
190+
191+
buildoptions {
192+
"`python2-config --includes`",
193+
"`pkg-config --cflags cairomm-1.0 pangomm-1.4`"
194+
}
195+
196+
linkoptions {
197+
"`python2-config --libs`",
198+
"`pkg-config --libs cairomm-1.0 pangomm-1.4`"
199+
}
200+

0 commit comments

Comments
 (0)