Permalink
Browse files

Pepper 26, misc++, bugfixes

- initialiser lists for array initialisation => Clang 3.1 required
- ported to Pepper 26
- bugfixes
- ozEngine
  * Builder class (nothing yet)
  • Loading branch information...
1 parent 18576b4 commit a34e9a0b7531b5f847a6fde250e2bee4acaeeb05 @ducakar committed Mar 31, 2013
View
@@ -16,9 +16,14 @@
* ALSA and OSS back-ends for System::bell()
* linear algebra classes added as primitives to streams, Log and JSON
* PFile class merged into File class
-- ozDynamics
+- ozDynamics: new rigid body dynamics library
* collision
- + primitives: Box, Capsule, Mesh, Compound
+ + primitives: Box, Capsule, Polytope, Compound
+- ozEngine: new engine building blocks library
+ * GL class for OpenGL utilities: error checks, DDS texture loader
+ * AL class for OpenAL utilities: error checks, WAVE & Vorbis loader, Vorbis streamer
+ * Window class based on client::Window
+ * Pepper class based on client::NaClPlatform
- matrix
* melee attack
- ui
View
@@ -12,7 +12,7 @@ Building
Building is currently supported under Linux. You can build Linux/Unix, Windows (MinGW) and Native
Client ports. Android port in still under development. See `cmake/*.Toolchain.cmake` files for all
-supported platforms/toolchains.
+supported platforms/toolchains. Only GCC >= 4.4 and LLVM/Clang >= 3.1 compilers are supported.
For generic Linux builds, make sure you have all the dependencies installed. You need to install
development packages for the following libraries:
@@ -267,6 +267,7 @@ The following alternative launches are available:
NaCl port. If `strip` is passed as the second option, binaries are stripped too.
Documentation
+
-------------
To generate documentation from source code with Doxygen, run
View
@@ -15,10 +15,10 @@
buildType=Debug
platforms=(
- Linux-x86_64-Clang
# Linux-x86_64
-# Linux-i686-Clang
+ Linux-x86_64-Clang
# Linux-i686
+# Linux-i686-Clang
# FreeBSD-x86_64-Clang
# FreeBSD-x86_64-GCC
# FreeBSD-i686-Clang
@@ -6,14 +6,15 @@ set( PLATFORM_TRIPLET "arm-nacl" )
set( PLATFORM_PREFIX "$ENV{NACL_SDK_ROOT}/toolchain/linux_arm_newlib" )
set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/NaCl-ARM" )
set( PLATFORM_EXE_SUFFIX ".ARM.nexe" )
+set( PLATFORM_FLAGS "-isystem $ENV{NACL_SDK_ROOT}/include" )
set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
set( CMAKE_SYSTEM_PROCESSOR "ARM" CACHE STRING "Target processor." )
set( CMAKE_FIND_ROOT_PATH "${PLATFORM_PORTS_PREFIX};${PLATFORM_PREFIX}/arm-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 "-U__STRICT_ANSI__" CACHE STRING "" )
-set( CMAKE_CXX_FLAGS "-U__STRICT_ANSI__" CACHE STRING "" )
+set( CMAKE_C_FLAGS "${PLATFORM_FLAGS} -U__STRICT_ANSI__" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "${PLATFORM_FLAGS} -U__STRICT_ANSI__" CACHE STRING "" )
set( CMAKE_C_FLAGS_RELEASE "-Ofast" CACHE STRING "" )
set( CMAKE_CXX_FLAGS_RELEASE "-Ofast" CACHE STRING "" )
@@ -6,14 +6,15 @@ set( PLATFORM_TRIPLET "i686-nacl" )
set( PLATFORM_PREFIX "$ENV{NACL_SDK_ROOT}/toolchain/linux_x86_newlib" )
set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/NaCl-i686" )
set( PLATFORM_EXE_SUFFIX ".i686.nexe" )
+set( PLATFORM_FLAGS "-isystem $ENV{NACL_SDK_ROOT}/include" )
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 "" )
+set( CMAKE_C_FLAGS "${PLATFORM_FLAGS} -msse3 -mfpmath=sse" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "${PLATFORM_FLAGS} -msse3 -mfpmath=sse" CACHE STRING "" )
set( CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -fomit-frame-pointer" CACHE STRING "" )
set( CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -fomit-frame-pointer" CACHE STRING "" )
@@ -6,14 +6,15 @@ set( PLATFORM_TRIPLET "x86_64-nacl" )
set( PLATFORM_PREFIX "$ENV{NACL_SDK_ROOT}/toolchain/linux_x86_newlib" )
set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/NaCl-x86_64" )
set( PLATFORM_EXE_SUFFIX ".x86_64.nexe" )
+set( PLATFORM_FLAGS "-isystem $ENV{NACL_SDK_ROOT}/include" )
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 "" )
+set( CMAKE_C_FLAGS "${PLATFORM_FLAGS} -msse3" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "${PLATFORM_FLAGS} -msse3" CACHE STRING "" )
set( CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math" CACHE STRING "" )
set( CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math" CACHE STRING "" )
@@ -9,6 +9,7 @@ set( PLATFORM_TRIPLET "pnacl" )
set( PLATFORM_PREFIX "$ENV{NACL_SDK_ROOT}/toolchain/linux_x86_pnacl/newlib" )
set( PLATFORM_PORTS_PREFIX "${CMAKE_SOURCE_DIR}/ports/PNaCl" )
set( PLATFORM_EXE_SUFFIX ".pexe" )
+set( PLATFORM_FLAGS "-I $ENV{NACL_SDK_ROOT}/include" )
set( CMAKE_SYSTEM_NAME "Linux" CACHE STRING "Target system." )
set( CMAKE_SYSTEM_PROCESSOR "LLVM-IR" CACHE STRING "Target processor." )
@@ -18,8 +19,8 @@ set( CMAKE_AR "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-ar"
set( CMAKE_RANLIB "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-ranlib" CACHE STRING "")
set( CMAKE_C_COMPILER "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-clang" )
set( CMAKE_CXX_COMPILER "${PLATFORM_PREFIX}/bin/${PLATFORM_TRIPLET}-clang++" )
-set( CMAKE_C_FLAGS "-U__STRICT_ANSI__" CACHE STRING "" )
-set( CMAKE_CXX_FLAGS "-U__STRICT_ANSI__" CACHE STRING "" )
+set( CMAKE_C_FLAGS "${PLATFORM_FLAGS} -U__STRICT_ANSI__" CACHE STRING "" )
+set( CMAKE_CXX_FLAGS "${PLATFORM_FLAGS} -U__STRICT_ANSI__" CACHE STRING "" )
set( CMAKE_C_FLAGS_RELEASE "-O4 -ffast-math" CACHE STRING "" )
set( CMAKE_CXX_FLAGS_RELEASE "-O4 -ffast-math" CACHE STRING "" )
Oops, something went wrong.

0 comments on commit a34e9a0

Please sign in to comment.