Merge pull request #7 from enduro2d/hotfix/update_modules

Hotfix/update modules

.travis.yml

@@ -64,6 +64,19 @@ matrix:
       compiler: clang
 before_install:
   - eval "${MATRIX_EVAL}"
+  - if [ "$TRAVIS_OS_NAME" == 'osx' ]; then
+    brew update;
+    brew upgrade cmake;
+    brew install git-lfs;
+    fi
+  - if [ "$TRAVIS_OS_NAME" == 'linux' ]; then
+    mkdir $HOME/cmake;
+    export PATH="$HOME/cmake/bin:$PATH";
+    travis_retry wget -q https://cmake.org/files/v3.11/cmake-3.11.4-Linux-x86_64.sh;
+    sh cmake-3.11.4-Linux-x86_64.sh --prefix=$HOME/cmake --exclude-subdir --skip-license;
+    fi
 script:
   - git submodule update --init --recursive
+  - git lfs install
+  - git lfs pull
   - ./scripts/build_all.sh

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
 project(enduro2d-bootstrap)
 
 #

scripts/build_all.bat

@@ -1,7 +1,7 @@
 @echo off
 set SCRIPT_DIR=%~dp0%
-%SCRIPT_DIR%\build_debug.bat || goto :error
-%SCRIPT_DIR%\build_release.bat || goto :error
+call %SCRIPT_DIR%\build_debug.bat || goto :error
+call %SCRIPT_DIR%\build_release.bat || goto :error
 
 goto :EOF
 

scripts/update_modules.sh

@@ -2,4 +2,4 @@
 git submodule init
 git submodule update
 git pull --recurse-submodules
-git submodule update --remote --recursive
+git submodule update --init --remote --recursive

sources/main.cpp

@@ -26,9 +26,10 @@ namespace
 }
 
 int e2d_main(int argc, char *argv[]) {
-    auto params = engine::parameters("bootstrap", "enduro2d")
+    const auto params = starter::parameters(
+        engine::parameters("bootstrap", "enduro2d")
             .timer_params(engine::timer_parameters()
-            .maximal_framerate(100));
-    modules::initialize<engine>(argc, argv, params).start<game>();
+                .maximal_framerate(100)));
+    modules::initialize<starter>(argc, argv, params).start<game>();
     return 0;
 }