diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 000b857..0000000 --- a/.appveyor.yml +++ /dev/null @@ -1,53 +0,0 @@ -environment: - global: - E2D_WITHOUT_AUDIO: true - E2D_WITHOUT_GRAPHICS: true - -image: - - Visual Studio 2017 - - Visual Studio 2019 - -platform: - - x86 - - x64 - -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 diff --git a/.github/workflows/darwin.yml b/.github/workflows/darwin.yml new file mode 100644 index 0000000..2ef4fff --- /dev/null +++ b/.github/workflows/darwin.yml @@ -0,0 +1,36 @@ +name: darwin + +on: [push, pull_request] + +env: + E2D_WITHOUT_AUDIO: true + E2D_WITHOUT_GRAPHICS: true + +jobs: + build: + runs-on: ${{matrix.config.os}} + strategy: + fail-fast: false + matrix: + config: + # https://github.com/actions/virtual-environments/tree/main/images/macos + - { os: "macos-10.15", xcode: "10.3", arch: "x64" } + - { os: "macos-12", xcode: "14.2", arch: "x64" } + name: "xcode-${{matrix.config.xcode}}" + steps: + - name: Setup + run: brew install cmake ninja + - name: Checkout + uses: actions/checkout@v3 + with: + lfs: true + submodules: recursive + - name: Select Xcode + run: sudo xcode-select --switch "/Applications/Xcode_${{matrix.config.xcode}}.app" + - name: Build + run: | + cmake --preset macos-${{matrix.config.arch}} + cmake --build --preset macos-${{matrix.config.arch}}-release + - name: Test + run: | + ctest --preset macos-${{matrix.config.arch}}-release diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml new file mode 100644 index 0000000..706ce40 --- /dev/null +++ b/.github/workflows/linux.yml @@ -0,0 +1,36 @@ +name: linux + +on: [push, pull_request] + +env: + E2D_WITHOUT_AUDIO: true + E2D_WITHOUT_GRAPHICS: true + +jobs: + build: + runs-on: ${{matrix.config.os}} + strategy: + fail-fast: false + matrix: + config: + # https://github.com/actions/virtual-environments/tree/main/images/linux + - { os: "ubuntu-20.04", cc: "gcc-7", cxx: "g++-7" } + - { os: "ubuntu-20.04", cc: "clang-7", cxx: "clang++-7" } + - { os: "ubuntu-22.04", cc: "gcc-12", cxx: "g++-12" } + - { os: "ubuntu-22.04", cc: "clang-14", cxx: "clang++-14" } + name: "${{matrix.config.cxx}}" + steps: + - name: Setup + run: sudo apt-get -y install cmake ninja-build libx11-dev libgl1-mesa-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev ${{matrix.config.cc}} ${{matrix.config.cxx}} + - name: Checkout + uses: actions/checkout@v3 + with: + lfs: true + submodules: recursive + - name: Build + run: | + cmake --preset linux-${{matrix.config.cc}} + cmake --build --preset linux-${{matrix.config.cc}}-release + - name: Test + run: | + ctest --preset linux-${{matrix.config.cc}}-release diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..206762c --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,38 @@ +name: windows + +on: [push, pull_request] + +env: + E2D_WITHOUT_AUDIO: true + E2D_WITHOUT_GRAPHICS: true + +jobs: + build: + runs-on: ${{matrix.config.os}} + strategy: + fail-fast: false + matrix: + config: + # https://github.com/actions/virtual-environments/tree/main/images/win + - { os: "windows-2019", vc: "msvc2019", arch: "x86" } + - { os: "windows-2019", vc: "msvc2019", arch: "x64" } + - { os: "windows-2022", vc: "msvc2022", arch: "x86" } + - { os: "windows-2022", vc: "msvc2022", arch: "x64" } + name: "${{matrix.config.vc}} ${{matrix.config.arch}}" + steps: + - name: Setup + run: choco install cmake ninja + - name: Checkout + uses: actions/checkout@v3 + with: + lfs: true + submodules: recursive + - name: Select MSVC + uses: ilammy/msvc-dev-cmd@v1 + - name: Build + run: | + cmake --preset windows-${{matrix.config.arch}}-${{matrix.config.vc}} + cmake --build --preset windows-${{matrix.config.arch}}-${{matrix.config.vc}}-release + - name: Test + run: | + ctest --preset windows-${{matrix.config.arch}}-${{matrix.config.vc}}-release diff --git a/.gitignore b/.gitignore index 907d79a..e848346 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -.vs/* -.vscode/* build/* +.clangd/* +.DS_Store CMakeSettings.json -CMakeLists.txt.user \ No newline at end of file +CMakeLists.txt.user diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 938b60b..0000000 --- a/.travis.yml +++ /dev/null @@ -1,138 +0,0 @@ -language: cpp - -env: - global: - - E2D_WITHOUT_AUDIO=true - - E2D_WITHOUT_GRAPHICS=true - -matrix: - include: - - # - # linux (g++-7) - # - - - os: linux - dist: xenial - stage: linux - 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: xenial - stage: linux - 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: xenial - stage: linux - 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: xenial - stage: linux - 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: xenial - stage: linux - 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: xenial - stage: linux - 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 - 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: - - 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 - -before_script: - - git submodule update --init --recursive - - git lfs install - - git lfs pull diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..f432300 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,11 @@ +{ + "version": "0.2.0", + "configurations": [{ + "name": "LLDB Debug", + "type": "lldb", + "request": "launch", + "program": "${command:cmake.launchTargetPath}", + "args": [], + "cwd": "${workspaceFolder}" + }] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..408f1f7 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,35 @@ +{ + "[cpp]": { + "files.encoding": "utf8", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true + }, + "[cmake]": { + "files.encoding": "utf8", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true + }, + "[python]": { + "files.encoding": "utf8", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true + }, + "[yaml]": { + "files.encoding": "utf8", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + "files.trimTrailingWhitespace": true + }, + "clangd.arguments": [ + "--all-scopes-completion", + "--background-index", + "--clang-tidy", + "--compile-commands-dir=${workspaceFolder}/.clangd", + "--completion-style=detailed", + "--header-insertion=never" + ], + "cmake.copyCompileCommands": "${workspaceFolder}/.clangd/compile_commands.json" +} diff --git a/BUILD_INSTRUCTIONS.md b/BUILD_INSTRUCTIONS.md index e64e074..7a549fb 100644 --- a/BUILD_INSTRUCTIONS.md +++ b/BUILD_INSTRUCTIONS.md @@ -4,8 +4,8 @@ - [git](https://git-scm.com/) - [git-lfs](https://git-lfs.github.com/) -- [cmake](https://cmake.org/) **>= 3.11** -- [gcc](https://www.gnu.org/software/gcc/) **>= 7** or [clang](https://clang.llvm.org/) **>= 5.0** or [msvc](https://visualstudio.microsoft.com/) **>= 2017** +- [cmake](https://cmake.org/) **>= 3.21** +- [gcc](https://www.gnu.org/software/gcc/) **>= 7** or [clang](https://clang.llvm.org/) **>= 7** or [msvc](https://visualstudio.microsoft.com/) **>= 2019** or [xcode](https://developer.apple.com/xcode/) **>= 10.3** ## * Cloning @@ -34,7 +34,7 @@ $ open enduro2d-bootstrap.xcodeproj # or Visual Studio project $ cd your_bootstrap_repository_directory $ mkdir msvc-build && cd msvc-build -$ cmake -G "Visual Studio 15 2017" .. +$ cmake -G "Visual Studio 16 2019" .. $ start enduro2d-bootstrap.sln ``` diff --git a/CMakeLists.txt b/CMakeLists.txt index 9432619..e2b0a55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11 FATAL_ERROR) +cmake_minimum_required(VERSION 3.21 FATAL_ERROR) project(enduro2d-bootstrap) # @@ -61,4 +61,3 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/bin $/bin) -add_e2d_shared_libraries_to_target(${PROJECT_NAME}) diff --git a/CMakePresets.json b/CMakePresets.json new file mode 100644 index 0000000..2676f8b --- /dev/null +++ b/CMakePresets.json @@ -0,0 +1,328 @@ +{ + "version": 3, + + "cmakeMinimumRequired": { + "major": 3, + "minor": 21, + "patch": 0 + }, + + "configurePresets": [ + { + "name": "ninja-base", + "hidden": true, + "generator": "Ninja Multi-Config", + "binaryDir": "${sourceDir}/build/${presetName}", + "installDir": "${sourceDir}/install/${presetName}", + "cacheVariables": { + "CMAKE_EXPORT_COMPILE_COMMANDS": true + } + }, + { + "name": "linux-base", + "hidden": true, + "inherits": "ninja-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Linux" + } + }, + { + "name": "linux-clang-7", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "clang-7", + "CMAKE_CXX_COMPILER": "clang++-7" + } + }, + { + "name": "linux-clang-14", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "clang-14", + "CMAKE_CXX_COMPILER": "clang++-14" + } + }, + { + "name": "linux-gcc-7", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "gcc-7", + "CMAKE_CXX_COMPILER": "g++-7" + } + }, + { + "name": "linux-gcc-12", + "inherits": "linux-base", + "cacheVariables": { + "CMAKE_C_COMPILER": "gcc-12", + "CMAKE_CXX_COMPILER": "g++-12" + } + }, + { + "name": "macos-base", + "hidden": true, + "inherits": "ninja-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Darwin" + } + }, + { + "name": "macos-arm64", + "inherits": "macos-base", + "architecture": { + "value": "arm64", + "strategy": "external" + } + }, + { + "name": "macos-x64", + "inherits": "macos-base", + "architecture": { + "value": "x64", + "strategy": "external" + } + }, + { + "name": "windows-base", + "hidden": true, + "inherits": "ninja-base", + "condition": { + "type": "equals", + "lhs": "${hostSystemName}", + "rhs": "Windows" + } + }, + { + "name": "windows-x86-msvc2019", + "inherits": "windows-base", + "architecture": { + "value": "x86", + "strategy": "external" + }, + "toolset": { + "value": "v142,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + }, + { + "name": "windows-x64-msvc2019", + "inherits": "windows-base", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "toolset": { + "value": "v142,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + }, + { + "name": "windows-x86-msvc2022", + "inherits": "windows-base", + "architecture": { + "value": "x86", + "strategy": "external" + }, + "toolset": { + "value": "v143,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + }, + { + "name": "windows-x64-msvc2022", + "inherits": "windows-base", + "architecture": { + "value": "x64", + "strategy": "external" + }, + "toolset": { + "value": "v143,host=x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_C_COMPILER": "cl", + "CMAKE_CXX_COMPILER": "cl" + } + } + ], + + "buildPresets": [ + { + "name": "linux-clang-7-debug", + "configuration": "Debug", + "configurePreset": "linux-clang-7" + }, + { + "name": "linux-clang-7-release", + "configuration": "Release", + "configurePreset": "linux-clang-7" + }, + { + "name": "linux-clang-14-debug", + "configuration": "Debug", + "configurePreset": "linux-clang-14" + }, + { + "name": "linux-clang-14-release", + "configuration": "Release", + "configurePreset": "linux-clang-14" + }, + { + "name": "linux-gcc-7-debug", + "configuration": "Debug", + "configurePreset": "linux-gcc-7" + }, + { + "name": "linux-gcc-7-release", + "configuration": "Release", + "configurePreset": "linux-gcc-7" + }, + { + "name": "linux-gcc-12-debug", + "configuration": "Debug", + "configurePreset": "linux-gcc-12" + }, + { + "name": "linux-gcc-12-release", + "configuration": "Release", + "configurePreset": "linux-gcc-12" + }, + { + "name": "macos-arm64-debug", + "configuration": "Debug", + "configurePreset": "macos-arm64" + }, + { + "name": "macos-arm64-release", + "configuration": "Release", + "configurePreset": "macos-arm64" + }, + { + "name": "macos-x64-debug", + "configuration": "Debug", + "configurePreset": "macos-x64" + }, + { + "name": "macos-x64-release", + "configuration": "Release", + "configurePreset": "macos-x64" + }, + { + "name": "windows-x86-msvc2019-debug", + "configuration": "Debug", + "configurePreset": "windows-x86-msvc2019" + }, + { + "name": "windows-x86-msvc2019-release", + "configuration": "Release", + "configurePreset": "windows-x86-msvc2019" + }, + { + "name": "windows-x64-msvc2019-debug", + "configuration": "Debug", + "configurePreset": "windows-x64-msvc2019" + }, + { + "name": "windows-x64-msvc2019-release", + "configuration": "Release", + "configurePreset": "windows-x64-msvc2019" + }, + { + "name": "windows-x86-msvc2022-debug", + "configuration": "Debug", + "configurePreset": "windows-x86-msvc2022" + }, + { + "name": "windows-x86-msvc2022-release", + "configuration": "Release", + "configurePreset": "windows-x86-msvc2022" + }, + { + "name": "windows-x64-msvc2022-debug", + "configuration": "Debug", + "configurePreset": "windows-x64-msvc2022" + }, + { + "name": "windows-x64-msvc2022-release", + "configuration": "Release", + "configurePreset": "windows-x64-msvc2022" + } + ], + + "testPresets": [ + { + "name": "test-base", + "hidden": true, + "output": { + "verbosity": "verbose" + }, + "configuration": "Release" + }, + { + "name": "linux-clang-7-release", + "inherits": "test-base", + "configurePreset": "linux-clang-7" + }, + { + "name": "linux-clang-14-release", + "inherits": "test-base", + "configurePreset": "linux-clang-14" + }, + { + "name": "linux-gcc-7-release", + "inherits": "test-base", + "configurePreset": "linux-gcc-7" + }, + { + "name": "linux-gcc-12-release", + "inherits": "test-base", + "configurePreset": "linux-gcc-12" + }, + { + "name": "macos-arm64-release", + "inherits": "test-base", + "configurePreset": "macos-arm64" + }, + { + "name": "macos-x64-release", + "inherits": "test-base", + "configurePreset": "macos-x64" + }, + { + "name": "windows-x86-msvc2019-release", + "inherits": "test-base", + "configurePreset": "windows-x86-msvc2019" + }, + { + "name": "windows-x64-msvc2019-release", + "inherits": "test-base", + "configurePreset": "windows-x64-msvc2019" + }, + { + "name": "windows-x86-msvc2022-release", + "inherits": "test-base", + "configurePreset": "windows-x86-msvc2022" + }, + { + "name": "windows-x64-msvc2022-release", + "inherits": "test-base", + "configurePreset": "windows-x64-msvc2022" + } + ] +} diff --git a/README.md b/README.md index 46c9117..d6fc592 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,23 @@ # Enduro2D-bootstrap (work in progress) -[![travis][badge.travis]][travis] -[![appveyor][badge.appveyor]][appveyor] +[![linux][badge.linux]][linux] +[![darwin][badge.darwin]][darwin] +[![windows][badge.windows]][windows] [![language][badge.language]][language] [![license][badge.license]][license] -[![paypal][badge.paypal]][paypal] ## [Build Instructions](./BUILD_INSTRUCTIONS.md) ## [License (MIT)](./LICENSE.md) -[badge.travis]: https://img.shields.io/travis/enduro2d/enduro2d-bootstrap/master.svg?logo=travis -[badge.appveyor]: https://img.shields.io/appveyor/ci/BlackMATov/enduro2d-bootstrap/master.svg?logo=appveyor -[badge.language]: https://img.shields.io/badge/language-C%2B%2B17-yellow.svg -[badge.license]: https://img.shields.io/badge/license-MIT-blue.svg -[badge.paypal]: https://img.shields.io/badge/donate-PayPal-orange.svg?logo=paypal&colorA=00457C +[badge.darwin]: https://img.shields.io/github/actions/workflow/status/enduro2d/enduro2d-bootstrap/.github/workflows/darwin.yml?label=Xcode&logo=xcode +[badge.linux]: https://img.shields.io/github/actions/workflow/status/enduro2d/enduro2d-bootstrap/.github/workflows/linux.yml?label=GCC%2FClang&logo=linux +[badge.windows]: https://img.shields.io/github/actions/workflow/status/enduro2d/enduro2d-bootstrap/.github/workflows/windows.yml?label=Visual%20Studio&logo=visual-studio +[badge.language]: https://img.shields.io/badge/language-C%2B%2B17-yellow +[badge.license]: https://img.shields.io/badge/license-MIT-blue -[travis]: https://travis-ci.org/enduro2d/enduro2d-bootstrap -[appveyor]: https://ci.appveyor.com/project/BlackMATov/enduro2d-bootstrap +[darwin]: https://github.com/enduro2d/enduro2d-bootstrap/actions?query=workflow%3Adarwin +[linux]: https://github.com/enduro2d/enduro2d-bootstrap/actions?query=workflow%3Alinux +[windows]: https://github.com/enduro2d/enduro2d-bootstrap/actions?query=workflow%3Awindows [language]: https://en.wikipedia.org/wiki/C%2B%2B17 -[license]: https://en.wikipedia.org/wiki/MIT_License -[paypal]: https://www.paypal.me/matov +[license]: https://en.wikipedia.org/wiki/MIT_License \ No newline at end of file diff --git a/modules/enduro2d b/modules/enduro2d index 9bec3ae..5de5583 160000 --- a/modules/enduro2d +++ b/modules/enduro2d @@ -1 +1 @@ -Subproject commit 9bec3ae2f29deaf03df4ffb6780cd8b9d1c04d8e +Subproject commit 5de5583dc523be6fcf9aefc413d08bba3f69973a diff --git a/scripts/build_all.bat b/scripts/build_all.bat deleted file mode 100644 index 9e778dc..0000000 --- a/scripts/build_all.bat +++ /dev/null @@ -1,12 +0,0 @@ -@echo off -set SCRIPT_DIR=%~dp0% -call %SCRIPT_DIR%\build_debug_x86.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 - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/build_all.sh b/scripts/build_all.sh deleted file mode 100755 index d9cd585..0000000 --- a/scripts/build_all.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash -set -e -SCRIPT_DIR=`dirname "$BASH_SOURCE"` -$SCRIPT_DIR/build_debug.sh -$SCRIPT_DIR/build_release.sh diff --git a/scripts/build_clear.bat b/scripts/build_clear.bat deleted file mode 100644 index 44375fb..0000000 --- a/scripts/build_clear.bat +++ /dev/null @@ -1,9 +0,0 @@ -@echo off -set BUILD_DIR=%~dp0%\..\build -rmdir /s /q %BUILD_DIR% || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/build_clear.sh b/scripts/build_clear.sh deleted file mode 100755 index ef8a2e3..0000000 --- a/scripts/build_clear.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash -set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build -rm -rf $BUILD_DIR diff --git a/scripts/build_debug.sh b/scripts/build_debug.sh deleted file mode 100755 index 25f0dee..0000000 --- a/scripts/build_debug.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build -mkdir -p $BUILD_DIR/Debug -pushd $BUILD_DIR/Debug -cmake -DCMAKE_BUILD_TYPE=Debug ../.. -cmake --build . -popd diff --git a/scripts/build_debug_x64.bat b/scripts/build_debug_x64.bat deleted file mode 100644 index 87d49aa..0000000 --- a/scripts/build_debug_x64.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -set BUILD_DIR=%~dp0%\..\build -mkdir %BUILD_DIR%\Debug\x64 || goto :error -pushd %BUILD_DIR%\Debug\x64 || goto :error -cmake ..\..\.. -A x64 || goto :error -cmake --build . --config Debug || goto :error -popd || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/build_debug_x86.bat b/scripts/build_debug_x86.bat deleted file mode 100644 index a11fce3..0000000 --- a/scripts/build_debug_x86.bat +++ /dev/null @@ -1,13 +0,0 @@ -@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% diff --git a/scripts/build_release.sh b/scripts/build_release.sh deleted file mode 100755 index eeae4bf..0000000 --- a/scripts/build_release.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build -mkdir -p $BUILD_DIR/Release -pushd $BUILD_DIR/Release -cmake -DCMAKE_BUILD_TYPE=Release ../.. -cmake --build . -popd diff --git a/scripts/build_release_x64.bat b/scripts/build_release_x64.bat deleted file mode 100644 index f5f88b0..0000000 --- a/scripts/build_release_x64.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -set BUILD_DIR=%~dp0%\..\build -mkdir %BUILD_DIR%\Release\x64 || goto :error -pushd %BUILD_DIR%\Release\x64 || goto :error -cmake ..\..\.. -A x64 || goto :error -cmake --build . --config Release || goto :error -popd || goto :error - -goto :EOF - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/build_release_x86.bat b/scripts/build_release_x86.bat deleted file mode 100644 index 97c9e80..0000000 --- a/scripts/build_release_x86.bat +++ /dev/null @@ -1,13 +0,0 @@ -@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% diff --git a/scripts/gen_msvc2017_project.bat b/scripts/gen_msvc2017_project.bat deleted file mode 100644 index 9890941..0000000 --- a/scripts/gen_msvc2017_project.bat +++ /dev/null @@ -1,13 +0,0 @@ -@echo off -set BUILD_DIR=%~dp0%\..\build -mkdir %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 - -:error -echo Failed with error #%errorlevel%. -exit /b %errorlevel% diff --git a/scripts/gen_msvc2019_project.bat b/scripts/gen_msvc2019_project.bat deleted file mode 100644 index be5651a..0000000 --- a/scripts/gen_msvc2019_project.bat +++ /dev/null @@ -1,13 +0,0 @@ -@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% diff --git a/scripts/gen_xcode_project.sh b/scripts/gen_xcode_project.sh deleted file mode 100755 index e15aeac..0000000 --- a/scripts/gen_xcode_project.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -BUILD_DIR=`dirname "$BASH_SOURCE"`/../build -mkdir -p $BUILD_DIR/xcode -pushd $BUILD_DIR/xcode -cmake -G Xcode ../.. -open enduro2d-bootstrap.xcodeproj -popd diff --git a/sources/main.cpp b/sources/main.cpp index fa502e7..7632f99 100644 --- a/sources/main.cpp +++ b/sources/main.cpp @@ -18,7 +18,7 @@ namespace E2D_UNUSED(owner, event); const keyboard& k = the().keyboard(); - if ( k.is_key_just_released(keyboard_key::f12) ) { + if ( k.is_key_just_released(keyboard_key::f1) ) { the().toggle_visible(!the().visible()); }