Permalink
Browse files

Misc fixes & cleanups, NaCl-glibc, oz_* pkgs

- ozCore
  * System: removed jniEnv, module and core pointers since those can be easily
    obtained in other ways
  * more consistent log output for Android
- client
  * includes and defines are shown in CXXFLAGS
- cmake
  * fixed configuration for lua 5.2 when 5.1 is also present
  * OZ_ADDRESS_SANITIZER option
- ports
  * updated to openal-soft-1.15.1
  * NaCl-x86_64-glibc, NaCl-i686-glibc
- data packages renamed (oz_*)
  • Loading branch information...
ducakar committed Dec 14, 2012
1 parent c97f152 commit 5e4e888e05d5c19f7b802d0ffbcb9e9c56907ae2
Showing with 578 additions and 347 deletions.
  1. +33 −23 CMakeLists.txt
  2. +5 −0 README.md
  3. +10 −0 TODO.md
  4. +7 −6 build.sh
  5. +1 −4 clean-blanks.sh
  6. +1 −1 cmake/Android14-ARM.Toolchain.cmake
  7. +1 −1 cmake/Android14-ARMv7a.Toolchain.cmake
  8. +1 −1 cmake/Android14-MIPS.Toolchain.cmake
  9. +1 −1 cmake/Android14-i686.Toolchain.cmake
  10. +16 −0 cmake/NaCl-i686-glibc.Toolchain.cmake
  11. +1 −1 cmake/NaCl-i686.Toolchain.cmake
  12. +16 −0 cmake/NaCl-x86_64-glibc.Toolchain.cmake
  13. +1 −1 cmake/NaCl-x86_64.Toolchain.cmake
  14. +1 −1 cmake/PNaCl.Toolchain.cmake
  15. 0 data/{ozbase/credits/ozbase.txt → oz_base/credits/oz_base.txt}
  16. 0 data/{ozbase → oz_base}/glsl/COPYING.txt
  17. 0 data/{ozbase → oz_base}/glsl/celestial.frag
  18. 0 data/{ozbase → oz_base}/glsl/celestial.json
  19. 0 data/{ozbase → oz_base}/glsl/celestial.vert
  20. 0 data/{ozbase → oz_base}/glsl/dmesh.json
  21. 0 data/{ozbase → oz_base}/glsl/dmesh.vert
  22. 0 data/{ozbase → oz_base}/glsl/header.glsl
  23. 0 data/{ozbase → oz_base}/glsl/mesh.frag
  24. 0 data/{ozbase → oz_base}/glsl/mesh.json
  25. 0 data/{ozbase → oz_base}/glsl/mesh.vert
  26. 0 data/{ozbase → oz_base}/glsl/plain.frag
  27. 0 data/{ozbase → oz_base}/glsl/plain.json
  28. 0 data/{ozbase → oz_base}/glsl/plain.vert
  29. 0 data/{ozbase → oz_base}/glsl/plant.json
  30. 0 data/{ozbase → oz_base}/glsl/plant.vert
  31. 0 data/{ozbase → oz_base}/glsl/postprocess.frag
  32. 0 data/{ozbase → oz_base}/glsl/postprocess.json
  33. 0 data/{ozbase → oz_base}/glsl/skeletalMesh.json
  34. 0 data/{ozbase → oz_base}/glsl/skeletalMesh.vert
  35. 0 data/{ozbase → oz_base}/glsl/stars.frag
  36. 0 data/{ozbase → oz_base}/glsl/stars.json
  37. 0 data/{ozbase → oz_base}/glsl/stars.vert
  38. 0 data/{ozbase → oz_base}/glsl/terraLand.frag
  39. 0 data/{ozbase → oz_base}/glsl/terraLand.json
  40. 0 data/{ozbase → oz_base}/glsl/terraWater.json
  41. 0 data/{ozbase → oz_base}/glsl/terraWater.vert
  42. 0 data/{ozbase/lingua/en/ozbase.po → oz_base/lingua/en/oz_base.po}
  43. 0 data/{ozbase/lingua/sl/ozbase.po → oz_base/lingua/sl/oz_base.po}
  44. 0 data/{openzone → oz_main}/baseq3/maps/atlantis.json
  45. 0 data/{openzone → oz_main}/baseq3/maps/beastBunker.json
  46. 0 data/{openzone → oz_main}/baseq3/maps/bunker.json
  47. 0 data/{openzone → oz_main}/baseq3/maps/forum.json
  48. 0 data/{openzone → oz_main}/baseq3/maps/house.json
  49. 0 data/{openzone → oz_main}/baseq3/maps/pool.json
  50. 0 data/{openzone → oz_main}/baseq3/maps/testCastle.json
  51. 0 data/{openzone → oz_main}/baseq3/maps/tower.json
  52. 0 data/{openzone → oz_main}/baseq3/maps/tutorial_carrying.json
  53. 0 data/{openzone → oz_main}/baseq3/maps/tutorial_movement.json
  54. 0 data/{openzone → oz_main}/class/bauul.json
  55. 0 data/{openzone → oz_main}/class/bauul_weapon.skull.json
  56. 0 data/{openzone → oz_main}/class/beast.json
  57. 0 data/{openzone → oz_main}/class/beast_weapon.plasmagun.json
  58. 0 data/{openzone → oz_main}/class/bigCrate.json
  59. 0 data/{openzone → oz_main}/class/bigExplosion.json
  60. 0 data/{openzone → oz_main}/class/binoculars.json
  61. 0 data/{openzone → oz_main}/class/bomb.json
  62. 0 data/{openzone → oz_main}/class/box.json
  63. 0 data/{openzone → oz_main}/class/console.json
  64. 0 data/{openzone → oz_main}/class/cvicek.json
  65. 0 data/{openzone → oz_main}/class/cyborg.json
  66. 0 data/{openzone → oz_main}/class/cyborg_weapon.chaingun.json
  67. 0 data/{openzone → oz_main}/class/datacube.json
  68. 0 data/{openzone → oz_main}/class/droid.OOM-9.json
  69. 0 data/{openzone → oz_main}/class/droid.json
  70. 0 data/{openzone → oz_main}/class/droid_weapon.blaster.json
  71. 0 data/{openzone → oz_main}/class/droid_weapon.chaingun.json
  72. 0 data/{openzone → oz_main}/class/droid_weapon.grenadeLauncher.json
  73. 0 data/{openzone → oz_main}/class/droid_weapon.hyperblaster.json
  74. 0 data/{openzone → oz_main}/class/explosiveBarrel.json
  75. 0 data/{openzone → oz_main}/class/firstAid.json
  76. 0 data/{openzone → oz_main}/class/galileo.json
  77. 0 data/{openzone → oz_main}/class/goblin.json
  78. 0 data/{openzone → oz_main}/class/goblin_weapon.axe.json
  79. 0 data/{openzone → oz_main}/class/grenade.json
  80. 0 data/{openzone → oz_main}/class/hoverTank.json
  81. 0 data/{openzone → oz_main}/class/key.json
  82. 0 data/{openzone → oz_main}/class/knight.json
  83. 0 data/{openzone → oz_main}/class/knight_weapon.mace.json
  84. 0 data/{openzone → oz_main}/class/metalBarrel.json
  85. 0 data/{openzone → oz_main}/class/metalCrate.json
  86. 0 data/{openzone → oz_main}/class/musicPlayer.json
  87. 0 data/{openzone → oz_main}/class/nvGoggles.json
  88. 0 data/{openzone → oz_main}/class/palm.json
  89. 0 data/{openzone → oz_main}/class/pine.json
  90. 0 data/{openzone → oz_main}/class/raptor.json
  91. 0 data/{openzone → oz_main}/class/serviceStation.json
  92. 0 data/{openzone → oz_main}/class/shell.json
  93. 0 data/{openzone → oz_main}/class/smallCrate.json
  94. 0 data/{openzone → oz_main}/class/smallExplosion.json
  95. 0 data/{openzone → oz_main}/class/tree.json
  96. 0 data/{openzone/credits/openzone.txt → oz_main/credits/oz_main.txt}
  97. 0 data/{openzone → oz_main}/frag/blasterBullet.json
  98. 0 data/{openzone → oz_main}/frag/chaingunBullet.json
  99. 0 data/{openzone → oz_main}/frag/gatlingBullet.json
  100. 0 data/{openzone → oz_main}/frag/gibs.json
  101. 0 data/{openzone → oz_main}/frag/heavyBlasterBullet.json
  102. 0 data/{openzone → oz_main}/frag/hyperblasterBullet.json
  103. 0 data/{openzone → oz_main}/frag/metal.json
  104. 0 data/{openzone → oz_main}/frag/plasmaBullet.json
  105. 0 data/{openzone → oz_main}/frag/ruins.json
  106. 0 data/{openzone → oz_main}/frag/tree.json
  107. 0 data/{openzone → oz_main}/frag/wood.json
  108. 0 data/{openzone/lingua/en/openzone.po → oz_main/lingua/en/oz_main.po}
  109. 0 data/{openzone/lingua/sl/openzone.po → oz_main/lingua/sl/oz_main.po}
  110. 0 data/{openzone → oz_main}/lua/COPYING.txt
  111. 0 data/{openzone → oz_main}/lua/matrix/generic.lua
  112. 0 data/{openzone → oz_main}/lua/matrix/handlers.lua
  113. 0 data/{openzone → oz_main}/lua/matrix/weapons.lua
  114. 0 data/{openzone → oz_main}/lua/nirvana/droid.lua
  115. 0 data/{openzone → oz_main}/lua/nirvana/minds.lua
  116. 0 data/{openzone_missions/credits/openzone_missions.txt → oz_missions/credits/oz_missions.txt}
  117. 0 data/{openzone_missions/lingua/en/openzone_missions.po → oz_missions/lingua/en/oz_missions.po}
  118. 0 data/{openzone_missions/lingua/sl/openzone_missions.po → oz_missions/lingua/sl/oz_missions.po}
  119. 0 data/{openzone_missions → oz_missions}/lua/nirvana/minds_cvicek.lua
  120. 0 data/{openzone_missions → oz_missions}/mission/00_tutorial/description.json
  121. 0 data/{openzone_missions → oz_missions}/mission/00_tutorial/lingua/en.po
  122. 0 data/{openzone_missions → oz_missions}/mission/00_tutorial/lingua/sl.po
  123. 0 data/{openzone_missions → oz_missions}/mission/00_tutorial/main.lua
  124. 0 data/{openzone_missions → oz_missions}/mission/01_cvicek/description.json
  125. 0 data/{openzone_missions → oz_missions}/mission/01_cvicek/intro.sequence.json
  126. 0 data/{openzone_missions → oz_missions}/mission/01_cvicek/lingua/en.po
  127. 0 data/{openzone_missions → oz_missions}/mission/01_cvicek/lingua/sl.po
  128. 0 data/{openzone_missions → oz_missions}/mission/01_cvicek/main.lua
  129. 0 data/{openzone_missions → oz_missions}/mission/test/description.json
  130. 0 data/{openzone_missions → oz_missions}/mission/test/lingua/en.po
  131. 0 data/{openzone_missions → oz_missions}/mission/test/lingua/sl.po
  132. 0 data/{openzone_missions → oz_missions}/mission/test/main.lua
  133. +88 −0 data/rz_main/baseq3/maps/testCastle.json
  134. +0 −2 etc/data-usage.lua
  135. +26 −26 etc/patches/{openal-soft-1.15.patch → openal-soft-1.15.1.patch}
  136. +1 −1 lib.sh
  137. +135 −67 ports.sh
  138. +1 −0 q3map2.sh
  139. +6 −9 run.sh
  140. +1 −1 src/CMakeLists.txt
  141. +77 −77 src/builder/BSP.cc
  142. +7 −0 src/client/BuildInfo.cc.in
  143. +3 −0 src/client/BuildInfo.hh
  144. +5 −8 src/client/CMakeLists.txt
  145. +1 −0 src/client/Client.cc
  146. +5 −2 src/client/NaClPlatform.cc
  147. +1 −1 src/client/Sound.cc
  148. +1 −1 src/client/Window.cc
  149. +1 −1 src/common/CMakeLists.txt
  150. +4 −11 src/ozCore/Alloc.cc
  151. +8 −5 src/ozCore/CMakeLists.txt
  152. +5 −3 src/ozCore/File.cc
  153. +1 −1 src/ozCore/List.hh
  154. +9 −6 src/ozCore/PFile.cc
  155. +1 −1 src/ozCore/StackTrace.cc
  156. +2 −3 src/ozCore/StackTrace.hh
  157. +67 −56 src/ozCore/System.cc
  158. +7 −13 src/ozCore/System.hh
  159. +6 −6 src/ozCore/common.hh
  160. +4 −0 src/ozCore/config.hh.in
  161. +10 −0 src/tests/test.cc
  162. +0 −4 src/tools/openzone.cc
  163. +0 −2 src/unittest/unittest.cc
View
@@ -8,6 +8,7 @@ project( openzone C CXX )
set( OZ_VERSION 0.3.81 )
+option( OZ_ADDRESS_SANITIZER "Enable AddressSanitizer memory checker." OFF )
option( OZ_TRACK_ALLOCS "Track memory allocations to detect new/delete mismatches and memory leaks." OFF )
option( OZ_SIMD_MATH "Use SIMD implementation of linear algebra classes." OFF )
option( OZ_ODE "Build complete ozDynamics library (requires Open Dynamics Engine)." OFF )
@@ -88,7 +89,7 @@ else()
if( CMAKE_SYSTEM_NAME STREQUAL Linux )
find_package( ALSA REQUIRED )
endif()
- pkg_check_modules( PULSE_SIMPLE libpulse-simple REQUIRED )
+ pkg_check_modules( PULSE_SIMPLE REQUIRED libpulse-simple )
endif()
find_package( PhysFS REQUIRED )
@@ -104,7 +105,7 @@ if( OZ_LUAJIT )
include_directories( SYSTEM ${LUAJIT_INCLUDE_DIRS} )
else()
- find_package( Lua51 REQUIRED )
+ pkg_check_modules( LUA REQUIRED lua )
endif()
if( OZ_SDL2 )
@@ -113,20 +114,22 @@ if( OZ_SDL2 )
include_directories( SYSTEM ${SDL2_INCLUDE_DIRS} )
else()
- find_package( SDL REQUIRED )
- find_package( SDL_ttf REQUIRED )
+ pkg_check_modules( SDL REQUIRED sdl )
+ pkg_check_modules( SDL_TTF REQUIRED SDL_ttf )
- mark_as_advanced( SDLMAIN_LIBRARY )
- mark_as_advanced( SDL_INCLUDE_DIR )
- mark_as_advanced( SDL_LIBRARY )
-
- include_directories( SYSTEM ${SDL_INCLUDE_DIR} )
+ include_directories( SYSTEM ${SDL_INCLUDE_DIRS} )
endif()
if( OZ_GL_ES )
# On embedded platform GLES is part of system libraries and is guaranteed to exist in toolchain or
# platform directory, no need to explicitly check existence or to detect library names.
- if( NOT PLATFORM_EMBEDDED )
+ if( ANDROID )
+ find_library( GLES2_LIBRARIES GLESv2 )
+ mark_as_advanced( GLES2_LIBRARIES )
+ elseif( NACL )
+ find_library( GLES2_LIBRARIES ppapi_gles2 )
+ mark_as_advanced( GLES2_LIBRARIES )
+ else()
pkg_check_modules( GLES2 REQUIRED glesv2 )
endif()
else()
@@ -139,10 +142,10 @@ pkg_check_modules( VORBISFILE REQUIRED vorbisfile )
# On embedded platforms linking is mostly static, so dependencies for all libraries must be linked
# too.
if( PLATFORM_EMBEDDED )
- pkg_check_modules( VORBIS REQUIRED vorbis ) # required by vorbisfile
- pkg_check_modules( OGG REQUIRED ogg ) # required by vorbisfile
- find_package( Freetype REQUIRED ) # required by SDL_ttf
find_package( ZLIB REQUIRED ) # required by PhysicsFS & FreeType
+ find_package( Freetype REQUIRED ) # required by SDL_ttf
+ pkg_check_modules( OGG REQUIRED ogg ) # required by vorbisfile
+ pkg_check_modules( VORBIS REQUIRED vorbis ) # required by vorbisfile
endif()
if( NOT PLATFORM_EMBEDDED )
@@ -170,15 +173,13 @@ mark_as_advanced( MINGW32_LIBRARY )
#
# Local libmad, faad and eSpeak headers.
-include_directories( SYSTEM ./include )
+include_directories( SYSTEM include )
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang )
set( flags "-std=c++11 -pedantic" )
# Use libc++ instead of libstdc++.
# set( flags "${flags} -stdlib=libc++" )
- # AddressSanitizer memory checker
- # set( flags "${flags} -fsanitize=address" )
# Analyse only.
# set( flags "${flags} --analyze -Qunused-arguments" )
elseif( ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.5 )
@@ -188,8 +189,11 @@ elseif( ANDROID )
else()
set( flags "-pipe -std=c++0x -pedantic -fstrict-enums" )
endif()
+if( OZ_ADDRESS_SANITIZER )
+ set( flags "${flags} -fsanitize=address" )
+endif()
-set( flags "${flags} -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -ffast-math" )
+set( flags "${flags} -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -ffast-math" )
# Additional warnings.
if( ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang )
@@ -201,12 +205,8 @@ else()
set( flags "${flags} -Wmissing-declarations -Wnon-virtual-dtor -Woverloaded-virtual" )
set( flags "${flags} -Wformat=2 -Wmissing-format-attribute -Winvalid-pch" )
- if( NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.6 )
- # set( flags "${flags} -Wsuggest-attribute=noreturn" )
- endif()
- if( NOT ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 4.7 )
- # set( flags "${flags} -Wzero-as-null-pointer-constant" )
- endif()
+ # set( flags "${flags} -Wsuggest-attribute=noreturn" )
+ # set( flags "${flags} -Wzero-as-null-pointer-constant" )
endif()
set( CMAKE_CXX_FLAGS "${flags} ${CMAKE_CXX_FLAGS}" )
@@ -215,6 +215,16 @@ set( CMAKE_CXX_FLAGS "${flags} ${CMAKE_CXX_FLAGS}" )
string( TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" OZ_CXX_FLAGS )
string( STRIP "${CMAKE_CXX_FLAGS} ${${OZ_CXX_FLAGS}}" OZ_CXX_FLAGS )
+get_directory_property( _includes INCLUDE_DIRECTORIES )
+foreach( _include ${_includes} )
+ set( OZ_CXX_FLAGS "${OZ_CXX_FLAGS} -I${_include}" )
+endforeach()
+
+get_directory_property( _defines COMPILE_DEFINITIONS )
+foreach( _define ${_defines} )
+ set( OZ_CXX_FLAGS "${OZ_CXX_FLAGS} -D${_define}" )
+endforeach()
+
site_name( OZ_HOSTNAME )
mark_as_advanced( OZ_HOSTNAME )
View
@@ -51,6 +51,11 @@ MinGW32 is searched in `/usr/i486-mingw32` by default. You may change that in
You may also want to set several options when configuring CMake build system:
+- `OZ_ADDRESS_SANITIZER`: Compile with AddressSanitizer support. AddressSanitizer is a memory
+ checker that detects stack and heap buffer overruns, malloc/free misuse and other memory errors.
+ GCC >= 4.8 or LLVM/Clang >= 3.2 is required.
+ `OFF` by default.
+
- `OZ_TRACK_ALLOCS`: Enable tracking of allocated memory chunks in liboz. Stack trace for every
memory allocation performed via new operator is saved for later diagnostics. It detects new/delete
mismatches and one can check for currently allocated memory chunks (and hence memory leaks).
View
10 TODO.md
@@ -1,6 +1,9 @@
CURRENT
- fix random splash event bug
+- keyboard control of UI
+- TalkFrame
+- per-game data subdirs
0.4
@@ -42,3 +45,10 @@ CURRENT
- unittest
* write missing tests
- documentation
+
+2.0
+
+- ozDynamics
+ * finish ozDynamics
+- matrix
+ * collision islands
View
@@ -15,13 +15,14 @@ buildType=Debug
platforms=(
Linux-x86_64 Linux-x86_64-Clang Linux-i686 Linux-i686-Clang
Windows-i686
- NaCl-x86_64 NaCl-i686 PNaCl
+ NaCl-x86_64 NaCl-x86_64-glibc NaCl-i686 NaCl-i686-glibc PNaCl
Android14-i686 Android14-ARM Android14-ARMv7a Android14-MIPS
)
-# Extract path to PNaCl SDK from CMake toolchain file.
-pnaclRoot=`egrep '^set\( PLATFORM_PREFIX' cmake/PNaCl.Toolchain.cmake | \
- sed -r 's|^set\( PLATFORM_PREFIX *"(.*)\" \)|\1|'`
+# 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`
function clean()
{
@@ -63,8 +64,8 @@ function pnacl()
{
for arch in x86_64 i686 arm; do
echo "Building openzone.$arch.nexe"
- "$pnaclRoot/bin64/pnacl-translate" -arch $arch -o build/PNaCl/src/tools/openzone.$arch.nexe \
- build/PNaCl/src/tools/openzone.pexe
+ "$pnaclPrefix/bin64/pnacl-translate" -arch $arch -o build/PNaCl/src/tools/openzone.$arch.nexe \
+ build/PNaCl/src/tools/openzone.pexe
done
}
View
@@ -10,10 +10,7 @@
# each file, remove duplicated blank lines and then remove one blank line at the end of each file.
#
-files=`git ls-files | \
- egrep -v '^include/|^doc/licences|\.patch$|\.po$' | \
- egrep -v 'README' | \
- egrep -v 'header\.glsl'`
+files=`git ls-files | egrep -v '^README|^doc/licences/|\.patch$|^include/|\.po$|/header\.glsl$'`
for file in $files; do
# Remove trailing blanks at the end of line.
@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "arm-linux-androideabi" )
@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "arm-linux-androideabi" )
@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "mipsel-linux-android" )
@@ -1,4 +1,4 @@
-set( ANDROID ON )
+set( ANDROID ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "i686-linux-android" )
@@ -0,0 +1,16 @@
+set( NACL ON )
+set( NACL_GLIBC ON )
+
+set( PLATFORM_EMBEDDED ON )
+set( PLATFORM_TRIPLET "i686-nacl" )
+set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc" )
+set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/NaCl-i686-glibc" )
+set( PLATFORM_EXE_SUFFIX ".i686.nexe" )
+
+set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
+set( CMAKE_SYSTEM_PROCESSOR "i686" CACHE STRING "Target processor." )
+set( CMAKE_FIND_ROOT_PATH "${PLATFORM_PORTS_PREFIX};${PLATFORM_PREFIX}/x86_64-nacl" )
+set( CMAKE_C_COMPILER "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-gcc" )
+set( CMAKE_CXX_COMPILER "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-g++" )
+set( CMAKE_C_FLAGS "-msse3 -mfpmath=sse" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "-msse3 -mfpmath=sse" CACHE STRING "" )
@@ -1,4 +1,4 @@
-set( NACL ON )
+set( NACL ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "i686-nacl" )
@@ -0,0 +1,16 @@
+set( NACL ON )
+set( NACL_GLIBC ON )
+
+set( PLATFORM_EMBEDDED ON )
+set( PLATFORM_TRIPLET "x86_64-nacl" )
+set( PLATFORM_PREFIX "/home/davorin/Projects/nacl_sdk/pepper_23/toolchain/linux_x86_glibc" )
+set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/NaCl-x86_64-glibc" )
+set( PLATFORM_EXE_SUFFIX ".x86_64.nexe" )
+
+set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
+set( CMAKE_SYSTEM_PROCESSOR "x86_64" CACHE STRING "Target processor." )
+set( CMAKE_FIND_ROOT_PATH "${PLATFORM_PORTS_PREFIX};${PLATFORM_PREFIX}/x86_64-nacl" )
+set( CMAKE_C_COMPILER "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-gcc" )
+set( CMAKE_CXX_COMPILER "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-g++" )
+set( CMAKE_C_FLAGS "-msse3" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "-msse3" CACHE STRING "" )
@@ -1,4 +1,4 @@
-set( NACL ON )
+set( NACL ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "x86_64-nacl" )
@@ -1,4 +1,4 @@
-set( NACL ON )
+set( NACL ON )
set( PLATFORM_EMBEDDED ON )
set( PLATFORM_TRIPLET "pnacl" )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,88 @@
+{
+ "title": "test castle",
+ "life": 20000,
+
+ "fragPool": "ruins",
+ "nFrags": 100,
+
+ "demolishSound": "free/explode",
+
+ "waterFogColour": [ 0.15, 0.00, 0.15, 1.00 ],
+
+ "boundObjects":
+ [
+ {
+ "class": "bauul",
+ "pos": [ 0, 0, 10 ],
+ "heading": "NORTH"
+ }
+ ],
+ "entities":
+ [
+ {
+ "title": "crusher",
+ "type": "CRUSHING_BLOCK",
+ "target": 0,
+ "move": [ 0, 7.68, 0 ],
+ "slideTime": 2.0,
+ "// timeout": 3.0,
+ "openSound": "free/rumble",
+ "closeSound": "free/rumble",
+ "frictSound": "kaiser_fx/hum6"
+ },
+ {
+ "title": "ignorant",
+ "type": "IGNORING_BLOCK",
+ "move": [ 0, 7.68, 0 ],
+ "slideTime": 2.0,
+ "// timeout": 4.0,
+ "openSound": "free/rumble",
+ "closeSound": "free/rumble",
+ "frictSound": "kaiser_fx/hum6",
+ "model":
+ {
+ "name": "biotank",
+ "translation": [ 0, -1, 0.5 ],
+ "rotation": [ 0, 0, 90 ]
+ }
+ },
+ {
+ "title": "auto door",
+ "type": "AUTO_DOOR",
+ "target": 2,
+ "move": [ 2.55, 0, 0 ],
+ "slideTime": 2.0,
+ "timeout": 2.0,
+ "openSound": "free/itemback",
+ "closeSound": "free/itemback",
+ "frictSound": ""
+ },
+ {
+ "title": "manual door",
+ "type": "MANUAL_DOOR",
+ "target": 3,
+ "key": 1,
+ "move": [ 5, 0, 0 ],
+ "slideTime": 2.0,
+ "openSound": "free/itemback",
+ "closeSound": "free/itemback",
+ "frictSound": ""
+ },
+ {
+ "title": "elevator",
+ "type": "ELEVATOR",
+ "target": 4,
+ "move": [ 0, 0, 3 ],
+ "slideTime": 2.5,
+ "openSound": "",
+ "closeSound": "",
+ "frictSound": "kaiser_fx/hum6"
+ },
+ {
+ "title": "switch",
+ "type": "STATIC",
+ "target": 3,
+ "openSound": "openarena/clack"
+ }
+ ]
+}
View
2 etc/data-usage.lua 100755 → 100644
@@ -1,5 +1,3 @@
-#!/usr/bin/lua
-
SIZE = 8192
DIM = 8
TERRA_DIM = 8
Oops, something went wrong.

0 comments on commit 5e4e888

Please sign in to comment.