Merge branch 'master' into setTileIDInMapNode

Author: SimplyLiz

.github/workflows/build-game.yml

@@ -1,13 +1,11 @@
-name: Build game
+name: Build
 
 on: [ push, pull_request ]
 
 jobs:
   build-msvc:
-    name: Build Windows
+    name: Windows
     env:
-      SCCACHE_DIR: C:\sccache
-      SCCACHE_CACHE_SIZE: 500M
       BUILD_TOOLS_PATH: C:\Program Files\Conan\conan
     runs-on: windows-latest
     steps:
@@ -17,29 +15,14 @@ jobs:
         with:
           submodules: true
 
-      - name: Prepare sccache timestamp
-        id: sccache_cache_timestamp
-        shell: cmake -P {0}
-        run: |
-          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-          message("::set-output name=timestamp::${current_date}")
-
-      - name: sccache cache files
-        uses: actions/cache@v2.1.7
-        with:
-          path: C:\sccache
-          key: windows-sccache-${{ steps.sccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: |
-            windows-sccache-
-
       - name: Cache conan
         uses: actions/cache@v2.1.7
         with:
           key: conan-win-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
           path: ~/.conan/
 
       - name: Install dependencies
-        run: choco install conan ninja sccache -y
+        run: choco install conan ninja -y
 
       - name: Enable Developer Command Prompt
         uses: ilammy/msvc-dev-cmd@v1.10.0
@@ -48,7 +31,6 @@ jobs:
         run: |
           cmake -GNinja -DCMAKE_BUILD_TYPE=Release .
           ninja
-          sccache --show-stats
 
       - name: Test
         run: ctest -j2 --output-on-failure
@@ -67,31 +49,15 @@ jobs:
         run: conan remove "*" -fsb
 
   build-gcc:
-    name: Build Linux
+    name: Linux
     env:
-      sccache_CACHE_SIZE: 500M
       CONAN_SYSREQUIRES_MODE: "enabled"
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
 
-      - name: Prepare sccache timestamp
-        id: sccache_cache_timestamp
-        shell: cmake -P {0}
-        run: |
-          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-          message("::set-output name=timestamp::${current_date}")
-
-      - name: sccache cache files
-        uses: actions/cache@v2.1.7
-        with:
-          path: ~/.cache/sccache
-          key: ubuntu-sccache-${{ steps.sccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: |
-            ubuntu-sccache-
-
       - name: Cache conan
         uses: actions/cache@v2.1.7
         with:
@@ -105,7 +71,6 @@ jobs:
           echo -e 'pcm.!default {\n type plug\n slave.pcm "null"\n}' > ~/.asoundrc
           curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-cmake.sh" | sudo bash
           curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-conan.sh" | sudo bash
-          curl "https://raw.githubusercontent.com/AnotherFoxGuy/ci-scripts/main/install-sccache.sh" | sudo bash
           conan install "xorg/system@"
           sudo apt-get -y install ninja-build libgl-dev libegl-dev
 
@@ -116,7 +81,6 @@ jobs:
       - name: Build
         run: |
           ninja
-          sccache --show-stats
 
       - name: Test
         env:
@@ -137,38 +101,21 @@ jobs:
         run: conan remove "*" -fsb
 
   build-appleclang:
-    name: Build Mac
-    env:
-      SCCACHE_CACHE_SIZE: 500M
+    name: MacOS
     runs-on: macos-latest
     steps:
       - uses: actions/checkout@v3
         with:
           submodules: true
 
-      - name: Prepare sccache timestamp
-        id: sccache_cache_timestamp
-        shell: cmake -P {0}
-        run: |
-          string(TIMESTAMP current_date "%Y-%m-%d-%H;%M;%S" UTC)
-          message("::set-output name=timestamp::${current_date}")
-
-      - name: sccache cache files
-        uses: actions/cache@v2.1.7
-        with:
-          path: ~/Library/Caches/Mozilla.sccache
-          key: macos-sccache-${{ steps.sccache_cache_timestamp.outputs.timestamp }}
-          restore-keys: |
-            macos-sccache-
-
       - name: Cache conan
         uses: actions/cache@v2.1.7
         with:
           key: conan-mac-${{ hashFiles('cmake/DependenciesConfig.cmake') }}
           path: ~/.conan/
 
       - name: Install dependencies
-        run: brew install conan sccache ninja
+        run: brew install conan ninja
 
       - name: Build
         run: |
@@ -180,7 +127,6 @@ jobs:
           ninja package
           rm -rf bin/Cytopia.App/Contents/MacOS/resources
           rm -rf bin/Cytopia.App/Resources
-          sccache --show-stats
         shell: bash
 
       - name: Test
@@ -200,4 +146,4 @@ jobs:
         shell: bash
 
       - name: Clean Conan pkgs
-        run: conan remove "*" -fsb
+        run: conan remove "*" -fsb

.gitignore

@@ -52,3 +52,4 @@ src/Makefile
 tools/l10n/TMP.pot
 
 _build/
+/build*/

CMakeLists.txt

@@ -7,6 +7,8 @@ include(SourceFileUtils)
 include(CMakeCM)
 set(_PREFIX "CYTOPIA_")
 
+set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" CACHE STRING "Configuration types")
+
 # Test if conan is installed
 find_program(CONAN_CMD_TEST conan NO_CACHE)
 cmake_dependent_option(USE_PACKAGE_MANAGER "Use conan" ON "NOT CONAN_CMD_TEST STREQUAL CONAN_CMD_TEST-NOTFOUND" OFF)
@@ -27,17 +29,6 @@ project(
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-find_program(SCCACHE_PROGRAM sccache)
-find_program(CCACHE_PROGRAM ccache)
-if (SCCACHE_PROGRAM)
-    set(CMAKE_CXX_COMPILER_LAUNCHER "${SCCACHE_PROGRAM}")
-    message("Using ${SCCACHE_PROGRAM} for speeding up build")
-elseif (CCACHE_PROGRAM)
-    set(CMAKE_CXX_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
-    message("Using ${CCACHE_PROGRAM} for speeding up build")
-endif ()
-
-
 # Allow user to globally set the library preference for external libraries
 cmd_option(
         ${_PREFIX}LIB_PREFERENCE
@@ -50,6 +41,7 @@ cmd_option(
 option(${_PREFIX}FORCE_SYSTEM_DEPENDENCIES "Force the use of system packages")
 
 option(BUILD_TEST "Build Cytopia Tests" ON)
+option(ENABLE_PHC "Use a Precompiled header for speeding up the build" ON)
 option(ENABLE_DEBUG "Enable Debug (asserts and logs)" OFF)
 option(ENABLE_ASAN "Enable Address Sanitizer" OFF)
 option(ENABLE_UBSAN "Enable Undefined Behaviour Sanitizer" OFF)
@@ -63,7 +55,6 @@ set(EXECUTABLE_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})
 set(LIBRARY_OUTPUT_PATH ${RUNTIME_OUTPUT_DIRECTORY})
 
 if (WIN32)
-    set(CMAKE_CONFIGURATION_TYPES "Debug" "Release" CACHE STRING "Configuration types")
     # fix executable paths for windows
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${RUNTIME_OUTPUT_DIRECTORY})
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${RUNTIME_OUTPUT_DIRECTORY})

README.md

@@ -67,6 +67,7 @@ Mac
 - [libogg](https://www.xiph.org/ogg/)
 - [libvorbis](https://www.xiph.org/vorbis/)
 - [libpng](http://www.libpng.org/pub/png/libpng.html)
+- [imgui](https://github.com/ocornut/imgui)
 
 #### Build instructions