فهرست منبع

Fix iOS build with ENABLE_PCH=OFF

https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891

Fixes #2991
Alexander Wilms 2 سال پیش
والد
کامیت
46d785c371
5فایلهای تغییر یافته به همراه4 افزوده شده و 12 حذف شده
  1. 0 7
      .github/workflows/github.yml
  2. 1 5
      CMakePresets.json
  3. 1 0
      client/CFocusableHelper.cpp
  4. 1 0
      client/ios/startSDL.mm
  5. 1 0
      client/ios/utils.mm

+ 0 - 7
.github/workflows/github.yml

@@ -159,7 +159,6 @@ jobs:
         VCMI_BUILD_PLATFORM: x64
 
     - name: ccache
-      if: startsWith(matrix.preset, 'ios') != true
       uses: hendrikmuhs/[email protected]
       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}}

+ 1 - 5
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",

+ 1 - 0
client/CFocusableHelper.cpp

@@ -9,6 +9,7 @@
  */
 #include "CFocusableHelper.h"
 #include "../Global.h"
+#include "StdInc.h"
 #include "widgets/TextControls.h"
 
 void removeFocusFromActiveInput()

+ 1 - 0
client/ios/startSDL.mm

@@ -8,6 +8,7 @@
  *
  */
 #import "startSDL.h"
+#include "StdInc.h"
 #import "GameChatKeyboardHandler.h"
 
 #include "../Global.h"

+ 1 - 0
client/ios/utils.mm

@@ -8,6 +8,7 @@
  *
  */
 
+#include "StdInc.h"
 #include "utils.h"
 
 #import <UIKit/UIKit.h>