Skip to content

Commit 5cbb449

Browse files
authored
Merge branch 'main' into main
2 parents e5d7dab + 250f754 commit 5cbb449

3 files changed

Lines changed: 21 additions & 3 deletions

File tree

.github/workflows/macos.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ jobs:
2828
echo "SCCACHE_BUCKET=sccache" >> $GITHUB_ENV
2929
echo "SCCACHE_ENDPOINT=http://robdangero.us:9000" >> $GITHUB_ENV
3030
echo "SCCACHE_REGION=auto" >> $GITHUB_ENV
31-
echo "/usr/local/opt/llvm/bin" >> $GITHUB_PATH
3231
3332
- name: Select Xcode
34-
run: sudo xcode-select -s /Applications/Xcode_14.3.app/Contents/Developer
33+
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
3534

3635
- name: Brew
37-
run: brew install sccache llvm
36+
run: |
37+
brew install sccache llvm@20
38+
echo "$(brew --prefix llvm@20)/bin" >> $GITHUB_PATH
3839
3940
- name: Build
4041
env:

kmake/src/main.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,15 @@ export async function run(options: any, loglog: any): Promise<string> {
10611061
else if (isPlatform(options, Platform.OSX) || isPlatform(options, Platform.iOS) || isPlatform(options, Platform.tvOS)) {
10621062
let xcodeOptions = ['-configuration', options.debug ? 'Debug' : 'Release', '-project', solutionName + '.xcodeproj', '-quiet'];
10631063

1064+
if (isPlatform(options, Platform.iOS)) {
1065+
xcodeOptions.push('-sdk');
1066+
xcodeOptions.push('iphoneos');
1067+
}
1068+
else if (isPlatform(options, Platform.tvOS)) {
1069+
xcodeOptions.push('-sdk');
1070+
xcodeOptions.push('appletvos');
1071+
}
1072+
10641073
if (options.nosigning) {
10651074
xcodeOptions.push('CODE_SIGN_IDENTITY=""');
10661075
xcodeOptions.push('CODE_SIGNING_REQUIRED=NO');

lib/kmake/main.js

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)