Travis steps in own scripts

.travis.yml

@@ -5,18 +5,16 @@ compiler:
     - gcc
 
 before_install:
-    - sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
-    - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
-    - sudo apt-get -qq -y update
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_before_install_linux.sh; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_before_install_mac.sh; fi
 
 install:
-    - sudo apt-get -qq -y install libsdl2-dev libsdl2-ttf-dev libalut-dev libpng12-dev zlib1g-dev
-    - if [ "$CC" = "gcc" ]; then sudo apt-get install gcc-4.8; fi
-    - if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_install_linux.sh; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_install_mac.sh; fi
 
 before_script:
-    - if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
-    - if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
+    - if [ "$TRAVIS_OS_NAME" = "linux" ]; then cmake/travis_before_script_linux.sh; fi
+    - if [ "$TRAVIS_OS_NAME" = "osx" ]; then cmake/travis_before_script_mac.sh; fi
 
 script:
     - (mkdir build && cd build && cmake .. && make)

CMakeLists.txt

@@ -32,12 +32,14 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 # Compiler specific flags
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-    set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
+    set (WARNINGS "${WARNINGS} -Weverything")
+    set (WARNINGS "${WARNINGS} -Wno-padded -Wno-packed")
     set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
     set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
-    set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
-    set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
-    set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
+
+    set (WARNINGS "${WARNINGS} -Wno-sign-conversion")
+    #set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32")
+
     set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
     set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0 -ftrapv")
     set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -O2 -fomit-frame-pointer")

ChangeLog.md

@@ -3,7 +3,8 @@
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
     [ 20140705 ]
-    * Added basic Travis CI support (Linux + clang only)
+    * Added basic Travis CI support
+    * Removed global object, using lazy initialization
 
     [ 20140704 ]
     * Removed unnecessary #include dependencies

TODO.md

@@ -30,8 +30,7 @@
 
 # Travis CI
 
-* Currently only building on Linux with clang, SDL, SDL_TTF, ALUT and PNG
-* Should also build with gcc, but needs newer gcc (4.8) with C++11 support
-* Should also build on Mac, but needs different before_install / install scripts,
-  that can detect the platform they’re running on
+* Currently only building on Linux
+    * Should also build on Mac, but needs different before_install / install scripts,
+      that can detect the platform they’re running on
 

cmake/travis_before_install_linux.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo add-apt-repository -y ppa:zoogie/sdl2-snapshots
+sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
+sudo apt-get -qq -y update
+

cmake/travis_before_install_mac.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+

cmake/travis_before_script_linux.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+if [ "$CC" = "gcc" ]; then export CC="gcc-4.8"; fi
+if [ "$CXX" = "g++" ]; then export CXX="g++-4.8"; fi
+

cmake/travis_before_script_mac.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+

cmake/travis_install_linux.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+sudo apt-get -qq -y install libsdl2-dev libsdl2-ttf-dev libalut-dev libpng12-dev zlib1g-dev
+if [ "$CC" = "gcc" ]; then sudo apt-get install gcc-4.8; fi
+if [ "$CXX" = "g++" ]; then sudo apt-get install g++-4.8; fi
+

cmake/travis_install_mac.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+

src/main.cpp

@@ -34,67 +34,64 @@
 #error No Windowing Library selected!
 #endif
 
-Camera gCamera;
-Console gConsole;
-FontManager gFont;
-Game gGame;
-Menu gMenu;
-OpenRaider gOpenRaider;
-Render gRender;
-TextureManager gTextureManager;
-World gWorld;
-
-#ifdef USING_AL
-SoundAL gSound;
-#else
-SoundNull gSound;
-#endif
-
-#ifdef USING_SDL
-WindowSDL gWindow;
-#endif
-
 Camera &getCamera() {
+    static Camera gCamera;
     return gCamera;
 }
 
 Console &getConsole() {
+    static Console gConsole;
     return gConsole;
 }
 
 Font &getFont() {
+    static FontManager gFont;
     return gFont;
 }
 
 Game &getGame() {
+    static Game gGame;
     return gGame;
 }
 
 Menu &getMenu() {
+    static Menu gMenu;
     return gMenu;
 }
 
 OpenRaider &getOpenRaider() {
+    static OpenRaider gOpenRaider;
     return gOpenRaider;
 }
 
 Render &getRender() {
+    static Render gRender;
     return gRender;
 }
 
 Sound &getSound() {
+#ifdef USING_AL
+    static SoundAL gSound;
+#else
+    static SoundNull gSound;
+#endif
     return gSound;
 }
 
 TextureManager &getTextureManager() {
+    static TextureManager gTextureManager;
     return gTextureManager;
 }
 
 Window &getWindow() {
+#ifdef USING_SDL
+    static WindowSDL gWindow;
+#endif
     return gWindow;
 }
 
 World &getWorld() {
+    static World gWorld;
     return gWorld;
 }
 
@@ -151,13 +148,13 @@ int main(int argc, char *argv[]) {
 
     // Try to load a configuration
     if (configArg) {
-        if (gOpenRaider.loadConfig(argv[1]) != 0) {
+        if (getOpenRaider().loadConfig(argv[1]) != 0) {
             std::cout << "Could not find the specified config file. Aborting..." << std::endl;
             return 2;
         }
     } else {
-        if (gOpenRaider.loadConfig(DEFAULT_CONFIG_FILE) != 0) {
-            if (gOpenRaider.loadConfig(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE) != 0) {
+        if (getOpenRaider().loadConfig(DEFAULT_CONFIG_FILE) != 0) {
+            if (getOpenRaider().loadConfig(DEFAULT_CONFIG_PATH "/" DEFAULT_CONFIG_FILE) != 0) {
                 std::cout << "Could not find a config file. Aborting..." << std::endl;
                 return 3;
             }
@@ -165,15 +162,15 @@ int main(int argc, char *argv[]) {
     }
 
     // Initialize everything
-    int error = gOpenRaider.initialize();
+    int error = getOpenRaider().initialize();
     if (error != 0) {
         std::cout << "Could not initialize OpenRaider (" << error << ")!" << std::endl;
         return 4;
     }
 
     // Enter Main loop
-    gConsole.print("Starting %s", VERSION);
-    gOpenRaider.run();
+    getConsole().print("Starting %s", VERSION);
+    getOpenRaider().run();
 
     return 0;
 }