Skip to content
Browse files

Misc++, bot$weapon

- ozCore
  * Log: indenting with substring of INDENT_BUFFER
- client
  * SDL_main inclusion avoided
- builder
  * '_weapon.' -> '$' for weapon names
- ports
  * attempt to build LuaJIT
- scripts
  * SDK paths sourced from ./sdkPaths
- 2013 update
  • Loading branch information...
1 parent 9208320 commit c0f2f872aed4e5427dcbb63c9f907b28dcfeac4f @ducakar committed Dec 28, 2012
Showing with 455 additions and 437 deletions.
  1. +6 −6 CMakeLists.txt
  2. +1 −1 ChangeLog.md
  3. +1 −1 README.md
  4. +2 −0 TODO.md
  5. +3 −4 build.sh
  6. +1 −0 cmake/Android14-ARM.Toolchain.cmake
  7. +1 −0 cmake/Android14-ARMv7a.Toolchain.cmake
  8. +1 −0 cmake/Android14-MIPS.Toolchain.cmake
  9. +1 −0 cmake/Android14-i686.Toolchain.cmake
  10. +9 −0 cmake/FreeBSD-i686.Toolchain.cmake
  11. +9 −0 cmake/FreeBSD-x86_64.Toolchain.cmake
  12. +1 −0 cmake/Linux-i686-Clang.Toolchain.cmake
  13. +1 −0 cmake/Linux-i686.Toolchain.cmake
  14. +1 −0 cmake/Linux-x86_64-Clang.Toolchain.cmake
  15. +1 −0 cmake/Linux-x86_64.Toolchain.cmake
  16. +1 −0 cmake/NaCl-i686-glibc.Toolchain.cmake
  17. +1 −0 cmake/NaCl-i686.Toolchain.cmake
  18. +1 −0 cmake/NaCl-x86_64-glibc.Toolchain.cmake
  19. +1 −0 cmake/NaCl-x86_64.Toolchain.cmake
  20. +1 −0 cmake/PNaCl.Toolchain.cmake
  21. +1 −0 cmake/Windows-i686.Toolchain.cmake
  22. +1 −1 data/oz_main/class/{bauul_weapon.skull.json → bauul$skull.json}
  23. +1 −1 data/oz_main/class/bauul.json
  24. +2 −2 data/oz_main/class/{beast_weapon.plasmagun.json → beast$plasmagun.json}
  25. +1 −1 data/oz_main/class/beast.json
  26. +2 −2 data/oz_main/class/{cyborg_weapon.chaingun.json → cyborg$chaingun.json}
  27. +1 −1 data/oz_main/class/cyborg.json
  28. +3 −3 data/oz_main/class/{droid_weapon.blaster.json → droid$blaster.json}
  29. +2 −2 data/oz_main/class/{droid_weapon.chaingun.json → droid$chaingun.json}
  30. +2 −2 data/oz_main/class/{droid_weapon.grenadeLauncher.json → droid$grenadeLauncher.json}
  31. +2 −2 data/oz_main/class/{droid_weapon.hyperblaster.json → droid$hyperblaster.json}
  32. +1 −1 data/oz_main/class/droid.OOM-9.json
  33. +2 −2 data/oz_main/class/droid.json
  34. +2 −3 data/oz_main/class/{goblin_weapon.axe.json → goblin$axe.json}
  35. +1 −1 data/oz_main/class/goblin.json
  36. +1 −2 data/oz_main/class/{knight_weapon.mace.json → knight$mace.json}
  37. +1 −1 data/oz_main/class/knight.json
  38. +1 −1 data/oz_missions/mission/00_tutorial/main.lua
  39. +18 −18 data/oz_missions/mission/01_cvicek/main.lua
  40. +3 −3 data/oz_missions/mission/test/main.lua
  41. +1 −1 doc/PREBERI.html
  42. +1 −1 doc/README.html
  43. +1 −1 doc/licences/COPYING.liboz.txt
  44. +0 −18 doc/licences/COPYING.s2tc.txt
  45. +1 −1 etc/nacl/openzone.en.html
  46. +1 −1 etc/nacl/openzone.sl.html
  47. +37 −25 ports.sh
  48. +2 −5 run.sh
  49. +16 −0 sdkPaths
  50. +2 −10 src/CMakeLists.txt
  51. +1 −1 src/builder/BSP.cc
  52. +1 −1 src/builder/BSP.hh
  53. +1 −1 src/builder/Builder.cc
  54. +1 −1 src/builder/Builder.hh
  55. +4 −0 src/builder/CMakeLists.txt
  56. +1 −1 src/builder/Caelum.cc
  57. +1 −1 src/builder/Caelum.hh
  58. +5 −5 src/builder/Class.cc
  59. +1 −1 src/builder/Class.hh
  60. +1 −1 src/builder/Compiler.cc
  61. +1 −1 src/builder/Compiler.hh
  62. +1 −1 src/builder/Context.cc
  63. +1 −1 src/builder/Context.hh
  64. +1 −1 src/builder/FragPool.cc
  65. +1 −1 src/builder/FragPool.hh
  66. +1 −1 src/builder/Lingua.cc
  67. +1 −1 src/builder/Lingua.hh
  68. +1 −1 src/builder/MD2.cc
  69. +1 −1 src/builder/MD2.hh
  70. +1 −1 src/builder/MD3.cc
  71. +1 −1 src/builder/MD3.hh
  72. +1 −1 src/builder/OBJ.cc
  73. +1 −1 src/builder/OBJ.hh
  74. +1 −1 src/builder/Terra.cc
  75. +1 −1 src/builder/Terra.hh
  76. +1 −1 src/builder/UI.cc
  77. +1 −1 src/builder/UI.hh
  78. +1 −1 src/builder/common.cc
  79. +1 −1 src/builder/common.hh
  80. +1 −1 src/builder/config.hh.in
  81. +1 −1 src/client/Audio.cc
  82. +1 −1 src/client/Audio.hh
  83. +1 −1 src/client/BSP.cc
  84. +1 −1 src/client/BSP.hh
  85. +1 −1 src/client/BSPAudio.cc
  86. +1 −1 src/client/BSPAudio.hh
  87. +1 −1 src/client/BasicAudio.cc
  88. +1 −1 src/client/BasicAudio.hh
  89. +1 −1 src/client/BotAudio.cc
  90. +1 −1 src/client/BotAudio.hh
  91. +1 −1 src/client/BuildInfo.cc.in
  92. +1 −1 src/client/BuildInfo.hh
  93. +1 −1 src/client/Caelum.cc
  94. +1 −1 src/client/Caelum.hh
  95. +1 −1 src/client/Camera.cc
  96. +1 −1 src/client/Camera.hh
  97. +1 −1 src/client/CinematicProxy.cc
  98. +1 −1 src/client/CinematicProxy.hh
  99. +7 −8 src/client/Client.cc
  100. +1 −3 src/client/Client.hh
  101. +1 −1 src/client/Context.cc
  102. +1 −1 src/client/Context.hh
  103. +1 −1 src/client/ExplosionImago.cc
  104. +1 −1 src/client/ExplosionImago.hh
  105. +1 −1 src/client/FragPool.cc
  106. +1 −1 src/client/FragPool.hh
  107. +1 −1 src/client/Frustum.cc
  108. +1 −1 src/client/Frustum.hh
  109. +1 −1 src/client/GameStage.cc
  110. +1 −1 src/client/GameStage.hh
  111. +1 −1 src/client/Imago.cc
  112. +1 −1 src/client/Imago.hh
  113. +1 −1 src/client/Input.cc
  114. +1 −1 src/client/Input.hh
  115. +1 −1 src/client/Loader.cc
  116. +1 −1 src/client/Loader.hh
  117. +1 −1 src/client/Lua.cc
  118. +1 −1 src/client/Lua.hh
  119. +1 −1 src/client/MD2.cc
  120. +1 −1 src/client/MD2.hh
  121. +1 −1 src/client/MD2Imago.cc
  122. +1 −1 src/client/MD2Imago.hh
  123. +1 −1 src/client/MD2WeaponImago.cc
  124. +1 −1 src/client/MD2WeaponImago.hh
  125. +1 −1 src/client/MD3.cc
  126. +1 −1 src/client/MD3.hh
  127. +1 −1 src/client/MD3Imago.cc
  128. +1 −1 src/client/MD3Imago.hh
  129. +1 −1 src/client/MenuStage.cc
  130. +1 −1 src/client/MenuStage.hh
  131. +1 −1 src/client/Mesh.cc
  132. +1 −1 src/client/Mesh.hh
  133. +1 −1 src/client/NaClDownloader.cc
  134. +1 −1 src/client/NaClDownloader.hh
  135. +1 −1 src/client/NaClPlatform.cc
  136. +1 −1 src/client/NaClPlatform.hh
  137. +1 −1 src/client/NaClUpdater.cc
  138. +1 −1 src/client/NaClUpdater.hh
  139. +1 −1 src/client/Network.cc
  140. +1 −1 src/client/Network.hh
  141. +1 −1 src/client/OpenAL.cc
  142. +1 −1 src/client/OpenAL.hh
  143. +1 −1 src/client/OpenGL.cc
  144. +1 −1 src/client/OpenGL.hh
  145. +2 −2 src/client/Profile.cc
  146. +1 −1 src/client/Profile.hh
  147. +1 −1 src/client/Proxy.cc
  148. +1 −1 src/client/Proxy.hh
  149. +1 −1 src/client/QuestList.cc
  150. +1 −1 src/client/QuestList.hh
  151. +1 −1 src/client/Render.cc
  152. +1 −1 src/client/Render.hh
  153. +1 −1 src/client/SMM.cc
  154. +1 −1 src/client/SMM.hh
  155. +1 −1 src/client/SMMImago.cc
  156. +1 −1 src/client/SMMImago.hh
  157. +1 −1 src/client/SMMVehicleImago.cc
  158. +1 −1 src/client/SMMVehicleImago.hh
  159. +1 −1 src/client/Shader.cc
  160. +1 −1 src/client/Shader.hh
  161. +1 −1 src/client/Shape.cc
  162. +1 −1 src/client/Shape.hh
  163. +1 −1 src/client/Sound.cc
  164. +1 −1 src/client/Sound.hh
  165. +1 −1 src/client/SparkModel.cc
  166. +1 −1 src/client/SparkModel.hh
  167. +1 −1 src/client/Stage.cc
  168. +1 −1 src/client/Stage.hh
  169. +1 −1 src/client/StrategicProxy.cc
  170. +1 −1 src/client/StrategicProxy.hh
  171. +1 −1 src/client/Terra.cc
  172. +1 −1 src/client/Terra.hh
  173. +1 −1 src/client/UnitProxy.cc
  174. +1 −1 src/client/UnitProxy.hh
  175. +1 −1 src/client/VehicleAudio.cc
  176. +1 −1 src/client/VehicleAudio.hh
  177. +1 −1 src/client/Window.cc
  178. +1 −1 src/client/Window.hh
  179. +1 −1 src/client/common.cc
  180. +6 −1 src/client/common.hh
  181. +1 −1 src/client/config.hh.in
  182. +1 −1 src/client/eSpeak.cc
  183. +1 −1 src/client/eSpeak.hh
  184. +1 −1 src/client/luaapi.cc
  185. +1 −1 src/client/luaapi.hh
  186. +1 −1 src/client/openzone.hh
  187. +1 −1 src/client/ui/Area.cc
  188. +1 −1 src/client/ui/Area.hh
  189. +5 −5 src/client/ui/BuildMenu.cc
  190. +1 −1 src/client/ui/BuildMenu.hh
  191. +1 −1 src/client/ui/Button.cc
  192. +1 −1 src/client/ui/Button.hh
  193. +1 −1 src/client/ui/CinematicText.cc
  194. +1 −1 src/client/ui/CinematicText.hh
  195. +1 −1 src/client/ui/CreditsMenu.cc
  196. +1 −1 src/client/ui/CreditsMenu.hh
  197. +1 −1 src/client/ui/DebugFrame.cc
  198. +1 −1 src/client/ui/DebugFrame.hh
  199. +1 −1 src/client/ui/Font.cc
  200. +1 −1 src/client/ui/Font.hh
  201. +1 −1 src/client/ui/Frame.cc
  202. +1 −1 src/client/ui/Frame.hh
  203. +1 −1 src/client/ui/GalileoFrame.cc
  204. +1 −1 src/client/ui/GalileoFrame.hh
  205. +1 −1 src/client/ui/HudArea.cc
  206. +1 −1 src/client/ui/HudArea.hh
  207. +1 −1 src/client/ui/InfoFrame.cc
  208. +1 −1 src/client/ui/InfoFrame.hh
  209. +1 −1 src/client/ui/Inventory.cc
  210. +1 −1 src/client/ui/Inventory.hh
  211. +1 −1 src/client/ui/Label.cc
  212. +1 −1 src/client/ui/Label.hh
  213. +1 −1 src/client/ui/LoadingArea.cc
  214. +1 −1 src/client/ui/LoadingArea.hh
  215. +2 −2 src/client/ui/MainMenu.cc
  216. +1 −1 src/client/ui/MainMenu.hh
  217. +1 −1 src/client/ui/MissionMenu.cc
  218. +1 −1 src/client/ui/MissionMenu.hh
  219. +1 −1 src/client/ui/Mouse.cc
  220. +1 −1 src/client/ui/Mouse.hh
  221. +1 −1 src/client/ui/MusicPlayer.cc
  222. +1 −1 src/client/ui/MusicPlayer.hh
  223. +1 −1 src/client/ui/QuestFrame.cc
  224. +1 −1 src/client/ui/QuestFrame.hh
  225. +1 −1 src/client/ui/SelectionArea.cc
  226. +1 −1 src/client/ui/SelectionArea.hh
  227. +1 −1 src/client/ui/SettingsFrame.cc
  228. +1 −1 src/client/ui/SettingsFrame.hh
  229. +1 −1 src/client/ui/Style.cc
  230. +1 −1 src/client/ui/Style.hh
  231. +1 −1 src/client/ui/TalkFrame.cc
  232. +1 −1 src/client/ui/TalkFrame.hh
  233. +1 −1 src/client/ui/Text.cc
  234. +1 −1 src/client/ui/Text.hh
  235. +1 −1 src/client/ui/UI.cc
  236. +1 −1 src/client/ui/UI.hh
  237. +1 −1 src/common/Lingua.cc
  238. +1 −1 src/common/Lingua.hh
  239. +1 −1 src/common/Lua.cc
  240. +1 −1 src/common/Lua.hh
  241. +1 −1 src/common/Timer.cc
  242. +1 −1 src/common/Timer.hh
  243. +2 −2 src/common/common.hh
  244. +1 −1 src/common/luaapi.hh
  245. +1 −1 src/common/luabase.cc
  246. +1 −1 src/common/luabase.hh
  247. +16 −33 src/matrix/BSP.cc
  248. +11 −11 src/matrix/BSP.hh
  249. +1 −1 src/matrix/Bot.cc
  250. +1 −1 src/matrix/Bot.hh
  251. +1 −1 src/matrix/BotClass.cc
  252. +1 −1 src/matrix/BotClass.hh
  253. +1 −1 src/matrix/Caelum.cc
  254. +1 −1 src/matrix/Caelum.hh
  255. +1 −1 src/matrix/Collider.cc
  256. +1 −1 src/matrix/Collider.hh
  257. +1 −1 src/matrix/Dynamic.cc
  258. +1 −1 src/matrix/Dynamic.hh
  259. +1 −1 src/matrix/DynamicClass.cc
  260. +1 −1 src/matrix/DynamicClass.hh
  261. +1 −1 src/matrix/Frag.cc
  262. +1 −1 src/matrix/Frag.hh
  263. +1 −1 src/matrix/FragPool.cc
  264. +1 −1 src/matrix/FragPool.hh
  265. +2 −3 src/matrix/Liber.cc
  266. +1 −1 src/matrix/Liber.hh
  267. +1 −1 src/matrix/Lua.cc
  268. +1 −1 src/matrix/Lua.hh
  269. +1 −1 src/matrix/Matrix.cc
  270. +1 −1 src/matrix/Matrix.hh
  271. +1 −1 src/matrix/NamePool.cc
  272. +1 −1 src/matrix/NamePool.hh
  273. +1 −1 src/matrix/Object.cc
  274. +1 −1 src/matrix/Object.hh
  275. +1 −1 src/matrix/ObjectClass.cc
  276. +1 −1 src/matrix/ObjectClass.hh
  277. +1 −1 src/matrix/Orbis.cc
  278. +1 −1 src/matrix/Orbis.hh
  279. +1 −1 src/matrix/Physics.cc
  280. +1 −1 src/matrix/Physics.hh
  281. +1 −1 src/matrix/Struct.cc
  282. +1 −1 src/matrix/Struct.hh
  283. +1 −1 src/matrix/Synapse.cc
  284. +1 −1 src/matrix/Synapse.hh
  285. +1 −1 src/matrix/Terra.cc
  286. +1 −1 src/matrix/Terra.hh
  287. +1 −1 src/matrix/Vehicle.cc
  288. +1 −1 src/matrix/Vehicle.hh
  289. +1 −1 src/matrix/VehicleClass.cc
  290. +1 −1 src/matrix/VehicleClass.hh
  291. +1 −1 src/matrix/Weapon.cc
  292. +1 −1 src/matrix/Weapon.hh
  293. +1 −1 src/matrix/WeaponClass.cc
  294. +1 −1 src/matrix/WeaponClass.hh
  295. +1 −1 src/matrix/common.hh
  296. +1 −1 src/matrix/luaapi.cc
  297. +1 −1 src/matrix/luaapi.hh
  298. +1 −1 src/modules/Module.cc
  299. +1 −1 src/modules/Module.hh
  300. +1 −1 src/modules/Modules.cc
Sorry, we could not display the entire diff because too many files (434) changed.
View
12 CMakeLists.txt
@@ -38,17 +38,15 @@ else()
endif()
if( ANDROID )
- set( CMAKE_SYSTEM_NAME Android )
set( OZ_SDL2 ON )
elseif( NACL )
- set( CMAKE_SYSTEM_NAME NaCl )
set( OZ_NET OFF )
set( OZ_SDL2 OFF )
elseif( WIN32 )
set( OZ_STANDALONE ON )
endif()
-set( OZ_PLATFORM_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" )
+set( OZ_PLATFORM_NAME "${PLATFORM_NAME}-${CMAKE_SYSTEM_PROCESSOR}" )
if( OZ_STANDALONE )
set( CMAKE_INSTALL_PREFIX "/OpenZone-${OZ_VERSION}" )
@@ -192,11 +190,11 @@ if( ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang )
# AddressSanitizer.
# set( flags "${flags} -fsanitize=address" )
elseif( ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.5 )
- set( flags "-pipe -std=gnu++0x" )
+ set( flags "-std=gnu++0x" )
elseif( ANDROID )
- set( flags "-pipe -std=gnu++0x -pedantic -fstrict-enums" )
+ set( flags "-std=gnu++0x -pedantic -fstrict-enums" )
else()
- set( flags "-pipe -std=c++0x -pedantic -fstrict-enums" )
+ set( flags "-std=c++0x -pedantic -fstrict-enums" )
endif()
set( flags "${flags} -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -ffast-math" )
@@ -216,6 +214,8 @@ else()
endif()
set( CMAKE_CXX_FLAGS "${flags} ${CMAKE_CXX_FLAGS}" )
+# set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fdata-sections -ffunction-sections" )
+# set( CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections" )
# Strings for BuildInfo class.
string( TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" OZ_CXX_FLAGS )
View
2 ChangeLog.md
@@ -10,7 +10,7 @@
+ HashIndex and HashString merged into new HashMap template class with an arbitrary key type
+ new HashSet template class: hashtable of key-only elements instead of key-value pairs
* new Mat33 class
- * SIMD support in linear algebra classes
+ * SIMD support for linear algebra classes
* new SpinLock class
* ALSA and OSS back-ends for System::bell()
* linear algebra classes added as primitives to streams, Log and JSON
View
2 README.md
@@ -235,7 +235,7 @@ One of the following commands must be given:
### `ports.sh [clean | fetch | build]` ###
This script is used to build libraries required by OpenZone for some platforms. Currently it builds
-zlib, physfs, SDL, SDL_ttf, OpenAL Soft, squish for NaCl-x86_64 and NaCl-i686.
+all required libraries for NaCl and Android configurations that are not provided by SDKs.
The following commands may be given (`build` is assumed if none):
- `clean`: Delete everything in `ports` directory except downloaded sources.
View
2 TODO.md
@@ -49,6 +49,8 @@ CURRENT
2.0
+- ozCore
+ * optional double precision
- ozDynamics
* finish ozDynamics
- matrix
View
7 build.sh
@@ -17,6 +17,8 @@ platforms=(
Linux-x86_64-Clang
Linux-i686
Linux-i686-Clang
+# FreeBSD-x86_64-Clang
+# FreeBSD-i686-Clang
Windows-i686
NaCl-x86_64
# NaCl-x86_64-glibc
@@ -29,10 +31,7 @@ platforms=(
Android14-MIPS
)
-# Extract path to NaCl SDK from CMake toolchain files.
-naclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64.Toolchain.cmake`
-naclGNUPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64-glibc.Toolchain.cmake`
-pnaclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/PNaCl.Toolchain.cmake`
+source ./sdkPaths
function clean()
{
View
1 cmake/Android14-ARM.Toolchain.cmake
@@ -1,5 +1,6 @@
set( ANDROID ON )
+set( PLATFORM_NAME "Android" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "arm-linux-androideabi" )
set( PLATFORM_PROC_PREFIX "armeabi" )
View
1 cmake/Android14-ARMv7a.Toolchain.cmake
@@ -1,5 +1,6 @@
set( ANDROID ON )
+set( PLATFORM_NAME "Android" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "arm-linux-androideabi" )
set( PLATFORM_PROC_PREFIX "armeabi-v7a" )
View
1 cmake/Android14-MIPS.Toolchain.cmake
@@ -1,5 +1,6 @@
set( ANDROID ON )
+set( PLATFORM_NAME "Android" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "mipsel-linux-android" )
set( PLATFORM_PROC_PREFIX "mips" )
View
1 cmake/Android14-i686.Toolchain.cmake
@@ -1,5 +1,6 @@
set( ANDROID ON )
+set( PLATFORM_NAME "Android" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "i686-linux-android" )
set( PLATFORM_PROC_PREFIX "x86" )
View
9 cmake/FreeBSD-i686.Toolchain.cmake
@@ -0,0 +1,9 @@
+set( PLATFORM_NAME "FreeBSD" )
+set( PLATFORM_PREFIX "" )
+
+set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
+set( CMAKE_SYSTEM_PROCESSOR "i686" CACHE STRING "Target processor." )
+set( CMAKE_C_COMPILER "/usr/local/bin/clang" )
+set( CMAKE_CXX_COMPILER "/usr/local/bin/clang++" )
+set( CMAKE_C_FLAGS "-march=i686 -m32 -msse3" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "-march=i686 -m32 -msse3" CACHE STRING "" )
View
9 cmake/FreeBSD-x86_64.Toolchain.cmake
@@ -0,0 +1,9 @@
+set( PLATFORM_NAME "FreeBSD" )
+set( PLATFORM_PREFIX "" )
+
+set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
+set( CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "Target processor." )
+set( CMAKE_C_COMPILER "/usr/local/bin/clang" )
+set( CMAKE_CXX_COMPILER "/usr/local/bin/clang++" )
+set( CMAKE_C_FLAGS "-march=x86-64 -m64 -msse3" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "-march=x86-64 -m64 -msse3" CACHE STRING "" )
View
1 cmake/Linux-i686-Clang.Toolchain.cmake
@@ -1,3 +1,4 @@
+set( PLATFORM_NAME "Linux" )
set( PLATFORM_PREFIX "" )
set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
View
1 cmake/Linux-i686.Toolchain.cmake
@@ -1,3 +1,4 @@
+set( PLATFORM_NAME "Linux" )
set( PLATFORM_PREFIX "" )
set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
View
1 cmake/Linux-x86_64-Clang.Toolchain.cmake
@@ -1,3 +1,4 @@
+set( PLATFORM_NAME "Linux" )
set( PLATFORM_PREFIX "" )
set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
View
1 cmake/Linux-x86_64.Toolchain.cmake
@@ -1,3 +1,4 @@
+set( PLATFORM_NAME "Linux" )
set( PLATFORM_PREFIX "" )
set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
View
1 cmake/NaCl-i686-glibc.Toolchain.cmake
@@ -1,6 +1,7 @@
set( NACL ON )
set( NACL_GLIBC ON )
+set( PLATFORM_NAME "NaCl" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "i686-nacl" )
set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc" )
View
1 cmake/NaCl-i686.Toolchain.cmake
@@ -1,5 +1,6 @@
set( NACL ON )
+set( PLATFORM_NAME "NaCl" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "i686-nacl" )
set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_newlib" )
View
1 cmake/NaCl-x86_64-glibc.Toolchain.cmake
@@ -1,6 +1,7 @@
set( NACL ON )
set( NACL_GLIBC ON )
+set( PLATFORM_NAME "NaCl" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "x86_64-nacl" )
set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc" )
View
1 cmake/NaCl-x86_64.Toolchain.cmake
@@ -1,5 +1,6 @@
set( NACL ON )
+set( PLATFORM_NAME "NaCl" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "x86_64-nacl" )
set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_newlib" )
View
1 cmake/PNaCl.Toolchain.cmake
@@ -1,5 +1,6 @@
set( NACL ON )
+set( PLATFORM_NAME "PNaCl" )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "pnacl" )
set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_canary/toolchain/linux_x86_pnacl/newlib" )
View
1 cmake/Windows-i686.Toolchain.cmake
@@ -1,5 +1,6 @@
set( MINGW32 ON )
+set( PLATFORM_NAME "Windows" )
set( PLATFORM_TRIPLET "i486-mingw32" )
set( PLATFORM_PREFIX "/usr/${PLATFORM_TRIPLET}" )
set( PLATFORM_TOOL_PREFIX "${PLATFORM_PREFIX}" )
View
2 data/oz_main/class/bauul_weapon.skull.json → data/oz_main/class/bauul$skull.json
@@ -22,7 +22,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "bauul_weapon.skull",
+ "imagoModel": "bauul$skull",
"audioType": "Basic",
"audioSounds":
View
2 data/oz_main/class/bauul.json
@@ -37,7 +37,7 @@
"nItems": 16,
"defaultItems":
[
- "bauul_weapon.skull"
+ "bauul$skull"
],
"weaponItem": 0,
View
4 ...oz_main/class/beast_weapon.plasmagun.json → data/oz_main/class/beast$plasmagun.json
@@ -9,7 +9,7 @@
"dim": [ 0.17, 0.75, 0.08 ],
"life": 100,
- "resistance": 40,
+ "resistance": 50,
"mass": 5,
"lift": 0.8,
@@ -26,7 +26,7 @@
"nFrags": 4,
"imagoType": "MD2Weapon",
- "imagoModel": "hobgoblin_weapon.plasmagun",
+ "imagoModel": "hobgoblin$plasmagun",
"audioType": "Basic",
"audioSounds":
View
2 data/oz_main/class/beast.json
@@ -22,7 +22,7 @@
"nItems": 8,
"defaultItems":
[
- "beast_weapon.plasmagun",
+ "beast$plasmagun",
"musicPlayer",
"firstAid",
"cvicek"
View
4 ...oz_main/class/cyborg_weapon.chaingun.json → data/oz_main/class/cyborg$chaingun.json
@@ -9,7 +9,7 @@
"dim": [ 0.28, 0.60, 0.135 ],
"life": 100,
- "resistance": 40,
+ "resistance": 50,
"mass": 5,
"lift": 0.8,
@@ -25,7 +25,7 @@
"nFrags": 4,
"imagoType": "MD2Weapon",
- "imagoModel": "ratamahatta_weapon.chaingun",
+ "imagoModel": "ratamahatta$chaingun",
"audioType": "Basic",
"audioSounds":
View
2 data/oz_main/class/cyborg.json
@@ -29,7 +29,7 @@
"nItems": 8,
"defaultItems":
[
- "cyborg_weapon.chaingun",
+ "cyborg$chaingun",
"galileo",
"musicPlayer"
],
View
6 data/oz_main/class/droid_weapon.blaster.json → data/oz_main/class/droid$blaster.json
@@ -8,9 +8,9 @@
"dim": [ 0.13, 0.27, 0.05 ],
"life": 100,
- "resistance": 40,
+ "resistance": 50,
- "mass": 10,
+ "mass": 5,
"lift": 0.8,
"nRounds": -1,
@@ -24,7 +24,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "droid_weapon.blaster",
+ "imagoModel": "droid$blaster",
"audioType": "Basic",
"audioSounds":
View
4 .../oz_main/class/droid_weapon.chaingun.json → data/oz_main/class/droid$chaingun.json
@@ -8,7 +8,7 @@
"dim": [ 0.15, 0.48, 0.07 ],
"life": 100,
- "resistance": 40,
+ "resistance": 50,
"mass": 10,
"lift": 0.8,
@@ -24,7 +24,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "droid_weapon.chaingun",
+ "imagoModel": "droid$chaingun",
"audioType": "Basic",
"audioSounds":
View
4 ...n/class/droid_weapon.grenadeLauncher.json → .../oz_main/class/droid$grenadeLauncher.json
@@ -8,7 +8,7 @@
"dim": [ 0.14, 0.32, 0.11 ],
"life": 100,
- "resistance": 40,
+ "resistance": 50,
"mass": 10,
"lift": 0.8,
@@ -24,7 +24,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "droid_weapon.grenadeLauncher",
+ "imagoModel": "droid$grenadeLauncher",
"audioType": "Basic",
"audioSounds":
View
4 ...main/class/droid_weapon.hyperblaster.json → data/oz_main/class/droid$hyperblaster.json
@@ -8,7 +8,7 @@
"dim": [ 0.15, 0.5, 0.05 ],
"life": 100,
- "resistance": 40,
+ "resistance": 50,
"mass": 10,
"lift": 0.8,
@@ -24,7 +24,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "droid_weapon.hyperblaster",
+ "imagoModel": "droid$hyperblaster",
"audioType": "Basic",
"audioSounds":
View
2 data/oz_main/class/droid.OOM-9.json
@@ -24,7 +24,7 @@
"nItems": 8,
"defaultItems":
[
- "droid_weapon.blaster"
+ "droid$blaster"
],
"weaponItem": 0,
View
4 data/oz_main/class/droid.json
@@ -24,8 +24,8 @@
"nItems": 8,
"defaultItems":
[
- "droid_weapon.blaster",
- "droid_weapon.hyperblaster",
+ "droid$blaster",
+ "droid$hyperblaster",
"bomb"
],
"weaponItem": 1,
View
5 data/oz_main/class/goblin_weapon.axe.json → data/oz_main/class/goblin$axe.json
@@ -8,9 +8,8 @@
"dim": [ 0.18, 0.42, 0.04 ],
"life": 100,
- "resistance": 40,
- "mass": 10,
+ "mass": 5,
"lift": 0.7,
"nRounds": -1,
@@ -22,7 +21,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "goblin_weapon.axe",
+ "imagoModel": "goblin$axe",
"audioType": "Basic",
"audioSounds":
View
2 data/oz_main/class/goblin.json
@@ -38,7 +38,7 @@
"nItems": 4,
"defaultItems":
[
- "goblin_weapon.axe",
+ "goblin$axe",
"cvicek"
],
"weaponItem": 0,
View
3 data/oz_main/class/knight_weapon.mace.json → data/oz_main/class/knight$mace.json
@@ -8,7 +8,6 @@
"dim": [ 0.35, 0.6, 0.15 ],
"life": 100,
- "resistance": 40,
"mass": 10,
"lift": 0.7,
@@ -22,7 +21,7 @@
"nFrags": 2,
"imagoType": "MD2Weapon",
- "imagoModel": "pknight_weapon.mace",
+ "imagoModel": "pknight$mace",
"audioType": "Basic",
"audioSounds":
View
2 data/oz_main/class/knight.json
@@ -19,7 +19,7 @@
"nItems": 8,
"defaultItems":
[
- "knight_weapon.mace",
+ "knight$mace",
"firstAid",
"cvicek",
"cvicek"
View
2 data/oz_missions/mission/00_tutorial/main.lua
@@ -214,7 +214,7 @@ function onCreate()
"Some objects like this bombs are dangerous. They will explode when destroyed or 5 s after " ..
"activation (they can also be deactivated by right clicking them again)." ) )
- ozOrbisAddObj( OZ_FORCE, "beast_weapon.plasmagun", oX - 5, oY + 20, oZ - 2 )
+ ozOrbisAddObj( OZ_FORCE, "beast$plasmagun", oX - 5, oY + 20, oZ - 2 )
ozOrbisAddObj( OZ_FORCE, "metalBarrel", oX - 10, oY + 30, oZ )
ozOrbisAddObj( OZ_FORCE, "metalBarrel", oX - 8, oY + 30, oZ )
View
36 data/oz_missions/mission/01_cvicek/main.lua
@@ -174,7 +174,7 @@ function onCreate()
ozOrbisAddObj( OZ_FORCE, "bomb", 789.50, 1001.00, 127.91 )
ozOrbisAddObj( OZ_FORCE, "droid", 780.15, 1004.64, 123.39 )
- ozObjAddItem( "droid_weapon.chaingun" )
+ ozObjAddItem( "droid$chaingun" )
ozBotSetH( 180.0 )
ozBotSetMind( "droid_guard" )
ozBotSetWeaponItem( 3 )
@@ -184,7 +184,7 @@ function onCreate()
ozBotSetMind( "droid_guard" )
ozOrbisAddObj( OZ_FORCE, "metalCrate", 810.41, 989.71, 124.33 )
- ozObjAddItem( "beast_weapon.plasmagun" )
+ ozObjAddItem( "beast$plasmagun" )
ozObjAddItem( "musicPlayer" )
ozObjAddItem( "musicPlayer" )
ozObjAddItem( "galileo" )
@@ -206,20 +206,20 @@ function onCreate()
ozOrbisAddStr( OZ_FORCE, "bunker", -20.0, -915.0, 138.5, OZ_NORTH )
ozOrbisAddObj( OZ_FORCE, "bigCrate", -33.32, -942.53, 137.93 )
- ozObjAddItem( "droid_weapon.chaingun" )
- ozObjAddItem( "droid_weapon.chaingun" )
- ozObjAddItem( "droid_weapon.chaingun" )
- ozObjAddItem( "droid_weapon.grenadeLauncher" )
- ozObjAddItem( "droid_weapon.grenadeLauncher" )
+ ozObjAddItem( "droid$chaingun" )
+ ozObjAddItem( "droid$chaingun" )
+ ozObjAddItem( "droid$chaingun" )
+ ozObjAddItem( "droid$grenadeLauncher" )
+ ozObjAddItem( "droid$grenadeLauncher" )
ozOrbisAddObj( OZ_FORCE, "bigCrate", -34.59, -942.09, 137.93 )
- ozObjAddItem( "droid_weapon.blaster" )
- ozObjAddItem( "droid_weapon.chaingun" )
- ozObjAddItem( "droid_weapon.chaingun" )
+ ozObjAddItem( "droid$blaster" )
+ ozObjAddItem( "droid$chaingun" )
+ ozObjAddItem( "droid$chaingun" )
ozOrbisAddObj( OZ_FORCE, "bigCrate", -34.14, -942.32, 139.14 )
- ozObjAddItem( "droid_weapon.hyperblaster" )
- ozObjAddItem( "droid_weapon.hyperblaster" )
+ ozObjAddItem( "droid$hyperblaster" )
+ ozObjAddItem( "droid$hyperblaster" )
ozOrbisAddObj( OZ_FORCE, "smallCrate", -33.20, -942.65, 138.84 )
ozOrbisAddObj( OZ_FORCE, "smallCrate", -32.26, -937.67, 137.63 )
@@ -276,8 +276,8 @@ function onCreate()
ozObjAddItem( "galileo" )
ozObjAddItem( "musicPlayer" )
ozObjAddItem( "nvGoggles" )
- ozObjAddItem( "beast_weapon.plasmagun" )
- ozObjAddItem( "beast_weapon.plasmagun" )
+ ozObjAddItem( "beast$plasmagun" )
+ ozObjAddItem( "beast$plasmagun" )
ozObjAddItem( "bomb" )
ozObjAddItem( "bomb" )
ozObjAddItem( "bomb" )
@@ -312,7 +312,7 @@ function onCreate()
ozBotSetMind( "droid_sniper" )
ozOrbisAddObj( OZ_FORCE, "droid", -24.16, -945.10, 138.14 )
- ozObjAddItem( "droid_weapon.chaingun" )
+ ozObjAddItem( "droid$chaingun" )
ozBotSetMind( "droid_guard" )
ozBotSetH( 0 )
ozBotSetWeaponItem( 3 )
@@ -326,7 +326,7 @@ function onCreate()
ozBotSetH( 0 )
ozOrbisAddObj( OZ_FORCE, "droid", -22.47, -917.67, 138.33 )
- ozObjAddItem( "droid_weapon.grenadeLauncher" )
+ ozObjAddItem( "droid$grenadeLauncher" )
ozBotSetMind( "droid_guard" )
ozBotSetH( 270 )
ozBotSetWeaponItem( 3 )
@@ -375,8 +375,8 @@ function onCreate()
ozOrbisAddObj( OZ_FORCE, "metalCrate", -1021.95, 597.90, 50.54 )
ozObjAddItem( "musicPlayer" )
ozObjAddItem( "musicPlayer" )
- ozObjAddItem( "beast_weapon.plasmagun" )
- ozObjAddItem( "beast_weapon.plasmagun" )
+ ozObjAddItem( "beast$plasmagun" )
+ ozObjAddItem( "beast$plasmagun" )
ozObjAddItem( "nvGoggles" )
ozObjAddItem( "galileo" )
ozObjAddItem( "firstAid" )
View
6 data/oz_missions/mission/test/main.lua
@@ -78,9 +78,9 @@ function init_sample()
ozOrbisAddObj( OZ_FORCE, "cvicek", cX - 8, cY - 2, cZ - 6 )
ozOrbisAddObj( OZ_FORCE, "firstAid", cX - 7, cY - 2, cZ - 6 )
ozOrbisAddObj( OZ_FORCE, "binoculars", cX - 6, cY - 2, cZ - 6 )
- ozOrbisAddObj( OZ_FORCE, "droid_weapon.hyperblaster", cX - 8, cY - 3, cZ - 6 )
- ozOrbisAddObj( OZ_FORCE, "droid_weapon.chaingun", cX - 7, cY - 3, cZ - 6 )
- ozOrbisAddObj( OZ_FORCE, "droid_weapon.grenadeLauncher", cX - 6, cY - 3, cZ - 6 )
+ ozOrbisAddObj( OZ_FORCE, "droid$hyperblaster", cX - 8, cY - 3, cZ - 6 )
+ ozOrbisAddObj( OZ_FORCE, "droid$chaingun", cX - 7, cY - 3, cZ - 6 )
+ ozOrbisAddObj( OZ_FORCE, "droid$grenadeLauncher", cX - 6, cY - 3, cZ - 6 )
ozOrbisAddObj( OZ_FORCE, "key", cX + 17, cY + 3, cZ - 6 )
View
2 doc/PREBERI.html
@@ -807,7 +807,7 @@ <h1 class="centre">OpenZone</h1>
<h2><a name="legal" href="#">Avtorske pravice</a></h2>
<h3>Pogon OpenZone</h3>
<div>
- Copyright © 2002-2012 Davorin Učakar
+ Copyright © 2002-2013 Davorin Učakar
</div>
<table>
<tr>
View
2 doc/README.html
@@ -807,7 +807,7 @@ <h1 class="centre">OpenZone</h1>
<h2><a name="legal" href="#">Legal</a></h2>
<h3>OpenZone Engine</h3>
<div>
- Copyright © 2002-2012 Davorin Učakar
+ Copyright © 2002-2013 Davorin Učakar
</div>
<table>
<tr>
View
2 doc/licences/COPYING.liboz.txt
@@ -1,4 +1,4 @@
-Copyright © 2002-2012 Davorin Učakar
+Copyright © 2002-2013 Davorin Učakar
This software is provided 'as-is', without any express or implied warranty.
In no event will the authors be held liable for any damages arising from
View
18 doc/licences/COPYING.s2tc.txt
@@ -1,18 +0,0 @@
-Copyright (C) 2011 Rudolf Polzer All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-RUDOLF POLZER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
2 etc/nacl/openzone.en.html
@@ -167,7 +167,7 @@
with native Linux and Windows versions.</p>
</div>
<div><small>
- <p>OpenZone (engine) © 2012 Davorin Učakar.<br/>
+ <p>OpenZone (engine) © 2002-2013 Davorin Učakar.<br/>
<a href="http://ducakar.github.com/openzone/">http://ducakar.github.com/openzone/</a></p>
<p>Engine is licensed under <a href="doc/licences/COPYING.GPL3.txt">GNU GPL 3.0</a>.
Data files and libraries distributed with OpenZone are work of various authors and use separate
View
2 etc/nacl/openzone.sl.html
@@ -166,7 +166,7 @@
Windows.</p>
</div>
<div><small>
- <p>OpenZone (pogon) © 2012 Davorin Učakar.<br/>
+ <p>OpenZone (pogon) © 2002-2013 Davorin Učakar.<br/>
<a href="http://ducakar.github.com/openzone/">http://ducakar.github.com/openzone/</a></p>
<p>Pogon OpenZone je pod licenco <a href="doc/licences/COPYING.GPL3.txt">GNU GPL 3.0</a>.
Podatkovni arhivi in knjižnice distribuirane skupaj z OpenZone so delo različnih avtorjev in so
View
62 ports.sh
@@ -3,7 +3,7 @@
# ports.sh [clean | fetch | build]
#
# This script is used to build libraries required by OpenZone for some platforms. Currently it
-# builds zlib, physfs, SDL, SDL_ttf, OpenAL Soft, squish for NaCl-x86_64 and NaCl-i686.
+# builds all required libraries for NaCl and Android configurations that are not provided by SDKs.
# The following commands may be given (`build` is assumed if none):
#
# - `clean`: Delete everything in `ports` directory except downloaded sources.
@@ -28,19 +28,7 @@ platforms=(
projectDir=`pwd`
topDir="$projectDir/ports"
-# Extract path to NaCl SDK from CMake toolchain files.
-naclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64.Toolchain.cmake`
-naclGNUPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64-glibc.Toolchain.cmake`
-pnaclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/PNaCl.Toolchain.cmake`
-
-ndkX86Tools="/opt/android-ndk/toolchains/x86-4.6/prebuilt/linux-x86"
-ndkX86Platform="/opt/android-ndk/platforms/android-14/arch-x86"
-
-ndkARMTools="/opt/android-ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86"
-ndkARMPlatform="/opt/android-ndk/platforms/android-14/arch-arm"
-
-ndkMIPSTools="/opt/android-ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86"
-ndkMIPSPlatform="/opt/android-ndk/platforms/android-14/arch-mips"
+source ./sdkPaths
function msg()
{
@@ -53,7 +41,6 @@ function msg()
echo -ne "\e[0m"
}
-
function setup_nacl64()
{
platform="NaCl-x86_64" # Platform name.
@@ -75,7 +62,7 @@ function setup_nacl64()
export CPPFLAGS="-I$buildDir/usr/include"
export CFLAGS="-O3 -ffast-math -msse3"
- export LDFLAGS="-L$buildDir/usr/lib"
+ export LDFLAGS="-L$buildDir/usr/lib -lnosys"
}
function setup_nacl64GNU()
@@ -99,7 +86,7 @@ function setup_nacl64GNU()
export CPPFLAGS="-I$buildDir/usr/include"
export CFLAGS="-O3 -ffast-math -msse3"
- export LDFLAGS="-L$buildDir/usr/lib -lnosys"
+ export LDFLAGS="-L$buildDir/usr/lib"
}
function setup_nacl32()
@@ -298,16 +285,19 @@ function fetch()
# zlib
download 'http://zlib.net/zlib-1.2.7.tar.bz2'
- # physfs 2.1
+ # PhysicsFS 2.1
cd "$topDir/archives"
if [[ -d physfs ]]
then cd physfs && hg pull -u
else hg clone 'http://hg.icculus.org/icculus/physfs/'
fi
- # lua
+ # Lua
download 'http://www.lua.org/ftp/lua-5.2.1.tar.gz'
+ # LuaJIT
+ download 'http://luajit.org/download/LuaJIT-2.0.0.tar.gz'
+
# SDL
download 'http://www.libsdl.org/release/SDL-1.2.15.tar.gz'
@@ -328,10 +318,10 @@ function fetch()
else hg clone 'http://hg.libsdl.org/SDL_ttf'
fi
- # freetype
+ # FreeType
download 'http://sourceforge.net/projects/freetype/files/freetype2/2.4.10/freetype-2.4.10.tar.bz2'
- # openal
+ # OpenAL Soft
download 'http://kcat.strangesoft.net/openal-releases/openal-soft-1.15.1.tar.bz2'
# libogg
@@ -432,6 +422,17 @@ function build_lua()
finish
}
+# TODO: LuaJIT cross-compiling doesn't work.
+function build_luajit()
+{
+ prepare LuaJIT-2.0.0 LuaJIT-2.0.0.tar.gz || return
+
+ make amalg PREFIX=/usr CC="$CC" BUILDMODE=static
+ make install DESTDIR="$buildDir" PREFIX=/usr
+
+ finish
+}
+
function build_sdl()
{
prepare SDL-1.2.15 SDL-1.2.15.tar.gz || return
@@ -537,7 +538,7 @@ function build()
# setup_nacl32GNU && build_zlib
setup_pnacl && build_zlib
- # physfs
+ # PhysicsFS
setup_nacl64 && build_physfs
# setup_nacl64GNU && build_physfs
setup_nacl32 && build_physfs
@@ -548,7 +549,7 @@ function build()
setup_ndkARM7 && build_physfs
setup_ndkMIPS && build_physfs
- # lua
+ # Lua
setup_nacl64 && build_lua
# setup_nacl64GNU && build_lua
setup_nacl32 && build_lua
@@ -559,6 +560,17 @@ function build()
setup_ndkARM7 && build_lua
setup_ndkMIPS && build_lua
+ # LuaJIT
+# setup_nacl64 && build_luajit
+# setup_nacl64GNU && build_luajit
+# setup_nacl32 && build_luajit
+# setup_nacl32GNU && build_luajit
+# setup_pnacl && build_luajit
+# setup_ndkX86 && build_luajit
+# setup_ndkARM && build_luajit
+# setup_ndkARM7 && build_luajit
+# setup_ndkMIPS && build_luajit
+
# SDL
setup_nacl64 && build_sdl
# setup_nacl64GNU && build_sdl
@@ -570,7 +582,7 @@ function build()
setup_ndkARM7 && build_sdl2
setup_ndkMIPS && build_sdl2
- # freetype
+ # FreeType
setup_nacl64 && build_freetype
# setup_nacl64GNU && build_freetype
setup_nacl32 && build_freetype
@@ -592,7 +604,7 @@ function build()
setup_ndkARM7 && build_sdl2_ttf
setup_ndkMIPS && build_sdl2_ttf
- # openal
+ # OpenAL Soft
setup_nacl64 && build_openal
# setup_nacl64GNU && build_openal
setup_nacl32 && build_openal
View
7 run.sh
@@ -16,13 +16,10 @@
defaultPlatform=Linux-x86_64-Clang
+source ./sdkPaths.sh
+
function run_nacl()
{
- # Extract path to NaCl SDK from CMake toolchain files.
- naclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64.Toolchain.cmake`
- naclGNUPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64-glibc.Toolchain.cmake`
- pnaclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/PNaCl.Toolchain.cmake`
-
mkdir -p build/NaCl-test
# Just create symlinks instead of copying.
View
16 sdkPaths
@@ -0,0 +1,16 @@
+# naclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64.Toolchain.cmake`
+# naclGNUPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/NaCl-x86_64-glibc.Toolchain.cmake`
+# pnaclPrefix=`sed -r '/ PLATFORM_PREFIX / !d; s|.*\"(.*)\".*|\1|' cmake/PNaCl.Toolchain.cmake`
+
+naclPrefix="/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_newlib"
+naclGNUPrefix="/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc"
+pnaclPrefix="/home/davorin/Projects/nacl_sdk/pepper_canary/toolchain/linux_x86_pnacl/newlib"
+
+ndkX86Tools="/opt/android-ndk/toolchains/x86-4.6/prebuilt/linux-x86"
+ndkX86Platform="/opt/android-ndk/platforms/android-14/arch-x86"
+
+ndkARMTools="/opt/android-ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86"
+ndkARMPlatform="/opt/android-ndk/platforms/android-14/arch-arm"
+
+ndkMIPSTools="/opt/android-ndk/toolchains/mipsel-linux-android-4.6/prebuilt/linux-x86"
+ndkMIPSPlatform="/opt/android-ndk/platforms/android-14/arch-mips"
View
12 src/CMakeLists.txt
@@ -7,19 +7,11 @@ add_subdirectory( unittest )
add_pch( pch stable.hh stable.cc )
add_subdirectory( common )
-
add_subdirectory( matrix )
add_subdirectory( nirvana )
add_subdirectory( modules )
add_subdirectory( client )
add_subdirectory( tools )
-
-if( NOT PLATFORM_EMBEDDED )
- add_subdirectory( builder )
-endif()
-
-if( NOT PLATFORM_EMBEDDED AND NOT WIN32 AND NOT APPLE )
- add_subdirectory( txc_dxtn )
-endif()
-
+add_subdirectory( builder )
+add_subdirectory( txc_dxtn )
add_subdirectory( tests )
View
2 src/builder/BSP.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/BSP.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Builder.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Builder.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
4 src/builder/CMakeLists.txt
@@ -1,5 +1,9 @@
configure_file( config.hh.in config.hh @ONLY )
+if( PLATFORM_EMBEDDED )
+ return()
+endif()
+
add_library( builder STATIC
#BEGIN SOURCES
BSP.hh
View
2 src/builder/Caelum.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Caelum.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
10 src/builder/Class.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -331,12 +331,12 @@ void Class::fillWeapon( const char* className )
context.usedSounds.include( audioSounds[Weapon::EVENT_SHOT_EMPTY] );
}
- int underscore = name.index( '_' );
- if( underscore < 0 ) {
- OZ_ERROR( "%s: Weapon name should be of the form botName_weapon.weaponName", className );
+ int dollar = name.index( '$' );
+ if( dollar < 0 ) {
+ OZ_ERROR( "%s: Weapon name should be of the form botPrefix$weaponName", className );
}
- userBase = name.substring( 0, underscore );
+ userBase = name.substring( 0, dollar );
nRounds = config["nRounds"].get( -1 );
shotInterval = config["shotInterval"].get( 0.5f );
View
2 src/builder/Class.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Compiler.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Compiler.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Context.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Context.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/FragPool.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/FragPool.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Lingua.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Lingua.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/MD2.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/MD2.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/MD3.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/MD3.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/OBJ.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/OBJ.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Terra.cc
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/Terra.hh
@@ -1,7 +1,7 @@
/*
* OpenZone - simple cross-platform FPS/RTS game engine.
*
- * Copyright © 2002-2012 Davorin Učakar
+ * Copyright © 2002-2013 Davorin Učakar
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
View
2 src/builder/UI.cc