update CI scripts

.appveyor.yml

@@ -1,11 +1,53 @@
-version: "{build}"
+environment:
+  global:
+    E2D_WITHOUT_AUDIO: true
+    E2D_WITHOUT_GRAPHICS: true
+
 image:
   - Visual Studio 2017
-  - Visual Studio 2019 Preview
+  - Visual Studio 2019
+
 platform:
-  - Win32
+  - x86
   - x64
-build_script:
+
+configuration:
+  - Debug
+  - Release
+
+for:
+
+-
+  matrix:
+    only:
+      - platform: x86
+        configuration: Debug
+  build_script:
+    - scripts\build_debug_x86.bat
+
+-
+  matrix:
+    only:
+      - platform: x64
+        configuration: Debug
+  build_script:
+    - scripts\build_debug_x64.bat
+
+-
+  matrix:
+    only:
+      - platform: x86
+        configuration: Release
+  build_script:
+    - scripts\build_release_x86.bat
+
+-
+  matrix:
+    only:
+      - platform: x64
+        configuration: Release
+  build_script:
+    - scripts\build_release_x64.bat
+
+before_build:
   - git submodule update --init --recursive
-  - scripts\build_all.bat
-test: off

.travis.yml

@@ -1,49 +1,138 @@
 language: cpp
+
+env:
+  global:
+    - E2D_WITHOUT_AUDIO=true
+    - E2D_WITHOUT_GRAPHICS=true
+
 matrix:
   include:
+
+    #
+    # linux (g++-7)
+    #
+
     - os: linux
-      dist: trusty
+      dist: xenial
-      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-7"] } }
+      stage: linux
-      env: MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
+      name: debug, g++-7
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-7"] } }
+      env: CC=gcc-7 CXX=g++-7
+      script: ./scripts/build_debug.sh
+
     - os: linux
-      dist: trusty
+      dist: xenial
-      addons: { apt: { sources: ubuntu-toolchain-r-test, packages: ["xorg-dev", "g++-8"] } }
+      stage: linux
-      env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8"
+      name: release, g++-7
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-7"] } }
+      env: CC=gcc-7 CXX=g++-7
+      script: ./scripts/build_release.sh
+
+    #
+    # linux (g++-8)
+    #
+
     - os: linux
-      dist: trusty
+      dist: xenial
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-5.0"], packages: ["xorg-dev", "clang-5.0", "g++-7"] } }
+      stage: linux
-      env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0"
+      name: debug, g++-8
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-8"] } }
+      env: CC=gcc-8 CXX=g++-8
+      script: ./scripts/build_debug.sh
+
     - os: linux
-      dist: trusty
+      dist: xenial
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-6.0"], packages: ["xorg-dev", "clang-6.0", "g++-7"] } }
+      stage: linux
-      env: MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
+      name: release, g++-8
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-8"] } }
+      env: CC=gcc-8 CXX=g++-8
+      script: ./scripts/build_release.sh
+
+    #
+    # linux (clang++-5.0)
+    #
+
     - os: linux
-      dist: trusty
+      dist: xenial
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-7"], packages: ["xorg-dev", "clang-7", "g++-7"] } }
+      stage: linux
-      env: MATRIX_EVAL="CC=clang-7 && CXX=clang++-7"
+      name: debug, clang++-5.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-5.0"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-7", "clang-5.0"] } }
+      env: CC=clang-5.0 CXX=clang++-5.0
+      script: ./scripts/build_debug.sh
+
     - os: linux
-      dist: trusty
+      dist: xenial
-      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-trusty-8"], packages: ["xorg-dev", "clang-8", "g++-7"] } }
+      stage: linux
-      env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8"
+      name: release, clang++-5.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-5.0"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-7", "clang-5.0"] } }
+      env: CC=clang-5.0 CXX=clang++-5.0
+      script: ./scripts/build_release.sh
+
+    #
+    # linux (clang++-6.0)
+    #
+
+    - os: linux
+      dist: xenial
+      stage: linux
+      name: debug, clang++-6.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-6.0"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-7", "clang-6.0"] } }
+      env: CC=clang-6.0 CXX=clang++-6.0
+      script: ./scripts/build_debug.sh
+
+    - os: linux
+      dist: xenial
+      stage: linux
+      name: release, clang++-6.0
+      addons: { apt: { sources: ["ubuntu-toolchain-r-test", "llvm-toolchain-xenial-6.0"], packages: ["libx11-dev", "libgl1-mesa-dev", "xorg-dev", "g++-7", "clang-6.0"] } }
+      env: CC=clang-6.0 CXX=clang++-6.0
+      script: ./scripts/build_release.sh
+
+    #
+    # macosx (xcode10)
+    #
+
     - os: osx
       osx_image: xcode10
-      compiler: clang
+      stage: macosx
+      name: debug, xcode10
+      addons: { homebrew: { packages: ["git-lfs"] } }
+      script: ./scripts/build_debug.sh
+
+    - os: osx
+      osx_image: xcode10
+      stage: macosx
+      name: release, xcode10
+      addons: { homebrew: { packages: ["git-lfs"] } }
+      script: ./scripts/build_release.sh
+
+    #
+    # macosx (xcode11)
+    #
+
+    - os: osx
+      osx_image: xcode11
+      stage: macosx
+      name: debug, xcode11
+      addons: { homebrew: { packages: ["git-lfs"] } }
+      script: ./scripts/build_debug.sh
+
+    - os: osx
+      osx_image: xcode11
+      stage: macosx
+      name: release, xcode11
+      addons: { homebrew: { packages: ["git-lfs"] } }
+      script: ./scripts/build_release.sh
+
 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:
+
+before_script:
   - git submodule update --init --recursive
   - git lfs install
   - git lfs pull
-  - git submodule foreach git lfs pull
-  - ./scripts/build_all.sh

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+Copyright (C) 2018-2020, by Matvey Cherevko (blackmatov@gmail.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

scripts/build_all.bat

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

scripts/build_debug.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/debug
+mkdir -p $BUILD_DIR/Debug
-cd $BUILD_DIR/debug
+pushd $BUILD_DIR/Debug
 cmake -DCMAKE_BUILD_TYPE=Debug ../..
-cmake --build . -- -j8
+cmake --build .
-cd ../..
+popd

scripts/build_debug_x64.bat

@@ -1,10 +1,10 @@
 @echo off
 set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\debug || goto :error
+mkdir %BUILD_DIR%\Debug\x64 || goto :error
-cd %BUILD_DIR%\debug || goto :error
+pushd %BUILD_DIR%\Debug\x64 || goto :error
-cmake ../.. || goto :error
+cmake ..\..\.. -A x64 || goto :error
 cmake --build . --config Debug || goto :error
-cd ..\.. || goto :error
+popd || goto :error
 
 goto :EOF
 

scripts/build_debug_x86.bat

@@ -0,0 +1,13 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\Debug\x86 || goto :error
+pushd %BUILD_DIR%\Debug\x86 || goto :error
+cmake ..\..\.. -A Win32 || goto :error
+cmake --build . --config Debug || goto :error
+popd || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%

scripts/build_release.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
-mkdir -p $BUILD_DIR/release
+mkdir -p $BUILD_DIR/Release
-cd $BUILD_DIR/release
+pushd $BUILD_DIR/Release
 cmake -DCMAKE_BUILD_TYPE=Release ../..
-cmake --build . -- -j8
+cmake --build .
-cd ../..
+popd

scripts/build_release_x64.bat

@@ -1,10 +1,10 @@
 @echo off
 set BUILD_DIR=%~dp0%\..\build
-mkdir %BUILD_DIR%\release || goto :error
+mkdir %BUILD_DIR%\Release\x64 || goto :error
-cd %BUILD_DIR%\release || goto :error
+pushd %BUILD_DIR%\Release\x64 || goto :error
-cmake ../.. || goto :error
+cmake ..\..\.. -A x64 || goto :error
 cmake --build . --config Release || goto :error
-cd ..\.. || goto :error
+popd || goto :error
 
 goto :EOF
 

scripts/build_release_x86.bat

@@ -0,0 +1,13 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\Release\x86 || goto :error
+pushd %BUILD_DIR%\Release\x86 || goto :error
+cmake ..\..\.. -A Win32 || goto :error
+cmake --build . --config Release || goto :error
+popd || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%

scripts/gen_msvc2017_project.bat

@@ -1,9 +1,10 @@
 @echo off
 set BUILD_DIR=%~dp0%\..\build
 mkdir %BUILD_DIR%\msvc2017 || goto :error
-cd %BUILD_DIR%\msvc2017 || goto :error
+pushd %BUILD_DIR%\msvc2017 || goto :error
 cmake -G "Visual Studio 15 2017" ..\.. || goto :error
 start enduro2d-bootstrap.sln || goto :error
+popd || goto :error
 
 goto :EOF
 

scripts/gen_msvc2019_project.bat

@@ -0,0 +1,13 @@
+@echo off
+set BUILD_DIR=%~dp0%\..\build
+mkdir %BUILD_DIR%\msvc2019 || goto :error
+pushd %BUILD_DIR%\msvc2019 || goto :error
+cmake -G "Visual Studio 16 2019" ..\.. || goto :error
+start enduro2d-bootstrap.sln || goto :error
+popd || goto :error
+
+goto :EOF
+
+:error
+echo Failed with error #%errorlevel%.
+exit /b %errorlevel%

scripts/gen_xcode_project.sh

@@ -2,6 +2,7 @@
 set -e
 BUILD_DIR=`dirname "$BASH_SOURCE"`/../build
 mkdir -p $BUILD_DIR/xcode
-cd $BUILD_DIR/xcode
+pushd $BUILD_DIR/xcode
 cmake -G Xcode ../..
 open enduro2d-bootstrap.xcodeproj
+popd

scripts/update_modules.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-git submodule update --init --recursive
-git submodule update --remote

sources/main.cpp

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * This file is part of the "Enduro2D"
  * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019 Matvey Cherevko
+ * Copyright (C) 2018-2020, by Matvey Cherevko (blackmatov@gmail.com)
  ******************************************************************************/
 
 #include <enduro2d/enduro2d.hpp>