mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-22 22:13:35 +02:00
Fix iOS build with ENABLE_PCH=OFF
https://github.com/vcmi/vcmi/issues/2991#issuecomment-1742066891 Fixes #2991
This commit is contained in:
parent
d695d87b99
commit
46d785c371
7
.github/workflows/github.yml
vendored
7
.github/workflows/github.yml
vendored
@ -159,7 +159,6 @@ jobs:
|
|||||||
VCMI_BUILD_PLATFORM: x64
|
VCMI_BUILD_PLATFORM: x64
|
||||||
|
|
||||||
- name: ccache
|
- name: ccache
|
||||||
if: startsWith(matrix.preset, 'ios') != true
|
|
||||||
uses: hendrikmuhs/ccache-action@v1.2
|
uses: hendrikmuhs/ccache-action@v1.2
|
||||||
with:
|
with:
|
||||||
key: ${{ matrix.preset }}
|
key: ${{ matrix.preset }}
|
||||||
@ -203,15 +202,9 @@ jobs:
|
|||||||
PULL_REQUEST: ${{ github.event.pull_request.number }}
|
PULL_REQUEST: ${{ github.event.pull_request.number }}
|
||||||
|
|
||||||
- name: CMake Preset with ccache
|
- name: CMake Preset with ccache
|
||||||
if: startsWith(matrix.preset, 'ios') != true
|
|
||||||
run: |
|
run: |
|
||||||
cmake -DCMAKE_CXX_COMPILER_LAUNCHER=ccache --preset ${{ matrix.preset }}
|
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
|
- name: Build Preset
|
||||||
run: |
|
run: |
|
||||||
cmake --build --preset ${{matrix.preset}}
|
cmake --build --preset ${{matrix.preset}}
|
||||||
|
@ -84,7 +84,6 @@
|
|||||||
"cacheVariables": {
|
"cacheVariables": {
|
||||||
"CMAKE_BUILD_TYPE": "Debug",
|
"CMAKE_BUILD_TYPE": "Debug",
|
||||||
"ENABLE_LUA" : "ON",
|
"ENABLE_LUA" : "ON",
|
||||||
"ENABLE_PCH" : "OFF",
|
|
||||||
"CMAKE_C_COMPILER": "/usr/bin/gcc",
|
"CMAKE_C_COMPILER": "/usr/bin/gcc",
|
||||||
"CMAKE_CXX_COMPILER": "/usr/bin/g++"
|
"CMAKE_CXX_COMPILER": "/usr/bin/g++"
|
||||||
}
|
}
|
||||||
@ -218,10 +217,7 @@
|
|||||||
"inherits": [
|
"inherits": [
|
||||||
"base-ios-release",
|
"base-ios-release",
|
||||||
"ios-device-conan"
|
"ios-device-conan"
|
||||||
],
|
]
|
||||||
"cacheVariables": {
|
|
||||||
"ENABLE_PCH" : "ON"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "ios-release-legacy",
|
"name": "ios-release-legacy",
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
*/
|
*/
|
||||||
#include "CFocusableHelper.h"
|
#include "CFocusableHelper.h"
|
||||||
#include "../Global.h"
|
#include "../Global.h"
|
||||||
|
#include "StdInc.h"
|
||||||
#include "widgets/TextControls.h"
|
#include "widgets/TextControls.h"
|
||||||
|
|
||||||
void removeFocusFromActiveInput()
|
void removeFocusFromActiveInput()
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#import "startSDL.h"
|
#import "startSDL.h"
|
||||||
|
#include "StdInc.h"
|
||||||
#import "GameChatKeyboardHandler.h"
|
#import "GameChatKeyboardHandler.h"
|
||||||
|
|
||||||
#include "../Global.h"
|
#include "../Global.h"
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "StdInc.h"
|
||||||
#include "utils.h"
|
#include "utils.h"
|
||||||
|
|
||||||
#import <UIKit/UIKit.h>
|
#import <UIKit/UIKit.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user