ScummVM/dockerized-bb
1
0
Fork 0
mirror of https://github.com/scummvm/dockerized-bb.git synced 2026-06-20 05:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

MACOSX/IPHONE: Synchronize settings between toolchain and worker

Browse Source
This commit is contained in:
Le Philousophe
2020-12-20 09:48:03 +00:00
parent 16ead2a0c0
commit cf9c01ade2
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchains/iphone/Dockerfile.m4
+1
View File
@@ -1,6 +1,7 @@
FROM toolchains/common AS helpers
FROM toolchains/apple-sdks AS sdks
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`IPHONE_SDK_VERSION',14.3)m4_dnl
m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
toolchains/macosx-i386/Dockerfile.m4
+2 -1
View File
@@ -1,4 +1,5 @@
# This toolchain is used for old x86 only Mac
# This worker is used for old i386 only Mac
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
toolchains/macosx/Dockerfile.m4
+1
View File
@@ -1,3 +1,4 @@
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
workers/iphone/Dockerfile.m4
+2 -1
View File
@@ -1,7 +1,8 @@
FROM toolchains/iphone AS toolchain
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`IPHONE_SDK_VERSION',14.2)m4_dnl
m4_define(`IPHONE_SDK_VERSION',14.3)m4_dnl
m4_define(`IPHONEOS_DEPLOYMENT_TARGET',7.0)m4_dnl
m4_include(`paths.m4')m4_dnl
workers/macosx-i386/Dockerfile.m4
+1
View File
@@ -1,5 +1,6 @@
# This worker is used for old i386 only Mac
m4_define(`TOOLCHAIN',macosx-i386)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`MACOSX_SDK_VERSION',10.13)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',i386)m4_dnl
workers/macosx/Dockerfile.m4
+5 -2
View File
@@ -1,9 +1,12 @@
m4_define(`TOOLCHAIN',macosx)m4_dnl
m4_dnl These settings must be kept in sync between toolchain and worker
m4_define(`PPA_CLANG',-10)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.0)m4_dnl
m4_define(`MACOSX_SDK_VERSION',11.1)m4_dnl
m4_define(`MACOSX_TARGET_ARCH',x86_64)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',20)m4_dnl
m4_define(`MACOSX_TARGET_VERSION',21)m4_dnl
m4_define(`MACOSX_DEPLOYMENT_TARGET',10.9)m4_dnl
m4_define(`MACOSX_ARCHITECTURES',`x86_64')m4_dnl
m4_define(`MACOSX_PORTS_ARCH_ARG',`')m4_dnl
m4_dnl We provide specific patch to add 11.1 support
m4_define(`PATCH_OSXCROSS',`')m4_dnl
m4_include(`macosx.m4')m4_dnl