Merge pull request #2 from teeworlds/master

jajaja

.circleci/config.yml

@@ -6,14 +6,36 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Build bam
+          name: Prepare
           command: |
             apt-get update -y
-            apt-get install libsdl2-dev libfreetype6-dev -y
+            apt-get install cmake libfreetype6-dev libsdl2-dev -y
+            git submodule update --init
+      - run:
+          name: Build bam
+          command: |
             git clone https://github.com/matricks/bam.git ~/bam
             cd ~/bam/
             git reset --hard f012dd9a3e38295b8a45af5a101d29573381f169
             ./make_unix.sh
       - run:
-          name: Build teeworlds
-          command: ~/bam/bam conf=release all
+          name: Build teeworlds with bam
+          command: ~/bam/bam conf=release all
+      - run:
+          name: Build teeworlds with cmake in Release mode
+          command: |
+            mkdir -p release
+            cd release
+            env CFLAGS="-Wdeclaration-after-statement -Werror" CXXFLAGS="-Werror" cmake -Werror=dev -DDOWNLOAD_GTEST=ON ..
+            make everything
+            make run_tests
+            ./teeworlds_srv shutdown
+      - run:
+          name: Build teeworlds with cmake in Debug mode
+          command: |
+            mkdir -p debug
+            cd debug
+            env CFLAGS="-Wdeclaration-after-statement -Werror" CXXFLAGS="-Werror" cmake -Werror=dev -DDOWNLOAD_GTEST=ON -DDEV=ON ..
+            make everything
+            make run_tests
+            ./teeworlds_srv shutdown

.gitignore

@@ -1,11 +1,72 @@
-/bam
 /.bam
-/config.lua
+/bam
 /build
+/config.lua
+/objs
+/other/*/include
+/other/*/lib
+/other/*/linux
+/other/*/mac
+/other/*/windows
 __pycache__/
+*.dll
+*.dmg
 *.pyc
 *.pyo
 scripts/work/
 /SDL.dll
 /freetype.dll
 /autoexec.cfg
+other/freetype
+other/sdl
+Info.plist
+
+crapnet*
+fake_server*
+map_resave*
+map_version*
+mastersrv*
+packetgen*
+teeworlds*
+!teeworlds.manifest
+!teeworlds.rc
+teeworlds_srv*
+testrunner
+versionsrv*
+
+# IDE project files
+.cproject
+.idea
+.project
+.settings
+.vs
+.vscode
+compile_commands.json
+cscope.files
+cscope.out
+out
+tags
+
+# CMake
+data
+generated
+
+.ninja_deps
+.ninja_log
+CMakeCache.txt
+CMakeFiles
+CMakeSettings*
+CPackConfig.cmake
+CPackSourceConfig.cmake
+Debug
+Makefile
+Release
+_CPack_Packages/
+build.ninja
+cmake_install.cmake
+googletest-build
+googletest-download
+googletest-src
+install_manifest.txt
+pack_*/
+rules.ninja

.gitmodules

@@ -1,6 +1,8 @@
 [submodule "datasrc/languages"]
 	path = datasrc/languages
 	url = git://github.com/teeworlds/teeworlds-translation.git
+	branch = master
 [submodule "datasrc/maps"]
 	path = datasrc/maps
 	url = git://github.com/teeworlds/teeworlds-maps.git
+	branch = master

.travis.yml

@@ -0,0 +1,19 @@
+os: osx
+script:
+- brew update
+- brew install sdl2
+- mkdir build; cd build
+- cmake -Werror=dev -DDOWNLOAD_GTEST=ON ..
+- make everything
+- make run_tests
+- make package_default
+- cd ..
+- mkdir build_debug; cd build_debug
+- cmake -Werror=dev -DDOWNLOAD_GTEST=ON -DDEV=ON ..
+- make run_tests
+- cd ../build
+- ./teeworlds_srv shutdown
+env:
+  global:
+  - CFLAGS="-Wdeclaration-after-statement -Werror"
+  - CXXFLAGS="-Werror"