diff --git a/.github/workflows/github.yml b/.github/workflows/github.yml index 4319c74e2..1fbc2a4b7 100644 --- a/.github/workflows/github.yml +++ b/.github/workflows/github.yml @@ -159,7 +159,6 @@ jobs: VCMI_BUILD_PLATFORM: x64 - name: ccache - if: startsWith(matrix.preset, 'ios') != true uses: hendrikmuhs/ccache-action@v1.2 with: key: ${{ matrix.preset }} @@ -203,15 +202,9 @@ jobs: PULL_REQUEST: ${{ github.event.pull_request.number }} - name: CMake Preset with ccache - if: startsWith(matrix.preset, 'ios') != true run: | cmake -DCMAKE_CXX_COMPILER_LAUNCHER=ccache --preset ${{ matrix.preset }} - - name: CMake Preset without ccache - if: startsWith(matrix.preset, 'ios') - run: | - cmake --preset ${{ matrix.preset }} - - name: Build Preset run: | cmake --build --preset ${{matrix.preset}} diff --git a/CMakePresets.json b/CMakePresets.json index ce2781c07..34a93a199 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -84,7 +84,6 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ENABLE_LUA" : "ON", - "ENABLE_PCH" : "OFF", "CMAKE_C_COMPILER": "/usr/bin/gcc", "CMAKE_CXX_COMPILER": "/usr/bin/g++" } @@ -218,10 +217,7 @@ "inherits": [ "base-ios-release", "ios-device-conan" - ], - "cacheVariables": { - "ENABLE_PCH" : "ON" - } + ] }, { "name": "ios-release-legacy", diff --git a/client/CFocusableHelper.cpp b/client/CFocusableHelper.cpp index e4e3c6cfe..c668f825b 100644 --- a/client/CFocusableHelper.cpp +++ b/client/CFocusableHelper.cpp @@ -9,6 +9,7 @@ */ #include "CFocusableHelper.h" #include "../Global.h" +#include "StdInc.h" #include "widgets/TextControls.h" void removeFocusFromActiveInput() diff --git a/client/ios/startSDL.mm b/client/ios/startSDL.mm index 24ad9a888..0b3b8028e 100644 --- a/client/ios/startSDL.mm +++ b/client/ios/startSDL.mm @@ -8,6 +8,7 @@ * */ #import "startSDL.h" +#include "StdInc.h" #import "GameChatKeyboardHandler.h" #include "../Global.h" diff --git a/client/ios/utils.mm b/client/ios/utils.mm index 42cca084e..2a04be7b3 100644 --- a/client/ios/utils.mm +++ b/client/ios/utils.mm @@ -8,6 +8,7 @@ * */ +#include "StdInc.h" #include "utils.h" #import