Merge branch 'master' of github.com:degenerated1123/REGoth

.travis.yml

@@ -0,0 +1,34 @@
+language: c++
+
+addons:
+    apt:
+        sources:
+            - ubuntu-toolchain-r-test
+            - george-edison55-precise-backports
+        packages:
+            - g++-6
+            - gcc-6
+            - cmake
+            - cmake-data
+            - libx11-xcb-dev
+            - libxcb-image0-dev
+            - libxcb-randr0-dev
+            - libudev-dev
+            - libopenal-dev
+            - freeglut3-dev
+            - libjpeg-dev
+            - libfreetype6-dev
+            - libxrandr-dev
+            - libglew-dev
+            - libsndfile1-dev
+
+git:
+  submodules: false
+
+script:
+  - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi
+  - git submodule update --init --recursive
+  - mkdir -p build
+  - cd build
+  - cmake ..
+  - make -j2

CMakeLists.txt

@@ -89,6 +89,10 @@ add_definitions(-DBGFX_CONFIG_MAX_VERTEX_BUFFERS=65535) # TODO: Don't mess aroun
 
 add_definitions(-DGLM_FORCE_PURE) # FIXME: glm crashes using SSE because of some alignment issues
 
+add_definitions(-D__STDC_LIMIT_MACROS)
+add_definitions(-D__STDC_CONSTANT_MACROS)
+add_definitions(-D__STDC_FORMAT_MACROS)
+
 # Temp
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g")
 
@@ -129,7 +133,7 @@ set(USE_GRAPHICAL_BENCHMARK OFF CACHE STRING "" FORCE)
 set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE STRING "" FORCE) # Don't statically link this
 set(BUILD_BULLET2_DEMOS OFF CACHE STRING "" FORCE) # No samples
 set(BUILD_OPENGL3_DEMOS OFF CACHE STRING "" FORCE) # No samples
-set(BUILD_UNIT_TESTS OF CACHE STRING "" FORCE) # No tests
+set(BUILD_UNIT_TESTS OFF CACHE STRING "" FORCE) # No tests
 set(BUILD_CPU_DEMOS OFF CACHE STRING "" FORCE) # No samples
 set(GLFW_BUILD_EXAMPLES OFF CACHE STRING "" FORCE)
 set(GLFW_BUILD_TESTS OFF CACHE STRING "" FORCE)

README.md

@@ -1,4 +1,4 @@
-# REGoth
+# REGoth [![Build status](https://ci.appveyor.com/api/projects/status/50yputp2qe764sg2?svg=true)](https://ci.appveyor.com/project/degenerated1123/regoth) [![Build Status](https://travis-ci.org/degenerated1123/REGoth.svg?branch=master)](https://travis-ci.org/degenerated1123/REGoth) 
 OpenSource-Reimplementation of the zEngine, used by the game "Gothic" and "Gothic II".
 
 # Source