Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Xcode10 #4

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Xcode10 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
df175a5
Add rule support for Yasm and GasPP to allow building on Xcode 10
Alfarache Aug 13, 2019
8bd160d
add deployment target
Alfarache Aug 13, 2019
be2b28b
increate IOS Deployment Target to 8.0
Alfarache Aug 13, 2019
77f7e33
Add support for arm64e
Alfarache Aug 13, 2019
424d70c
add .asm build rule for iphone simulators
Alfarache Aug 16, 2019
c83b798
set minimum iOS version to 8.0
Alfarache Aug 16, 2019
d37c5d5
pass arm64 or arm64e based on $CURRENT_ARCH
Alfarache Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 58 additions & 4 deletions xcode.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,46 @@ FOR EACH WORKSPACE
ENDIF
ENDFOR
PRINTNL /* End PBXGroup section */
PRINTNL
PRINTNL /* Begin PBXBuildRule section */
IFDEF TARGET_IPHONE
PRINTNL F1B8878A22FE0D360002351B /* PBXBuildRule */ = {
PRINTNL isa = PBXBuildRule;
PRINTNL compilerSpec = com.apple.compilers.proxy.script;
PRINTNL filePatterns = "*.S";
PRINTNL fileType = pattern.proxy;
PRINTNL isEditable = 1;
PRINTNL outputFiles = (
PRINTNL "${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
PRINTNL );
PRINTNL script = "ARRAY=(${USER_HEADER_SEARCH_PATHS})\n\ninclude_paths=\"\"\nfor i in \"${ARRAY[@]}\"\ndo\ninclude_paths=$include_paths\"-I\"$i\" \"\ndone\n\ncd ${SOURCE_ROOT}\n#export PATH=\"/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin:/Applications/Xcode.app/Contents/Developer/usr/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin\"\n\narchType=\"armv7\"\nif [[ ${INPUT_FILE_PATH} =~ \"64.S\" ]]\nthen\n archType='arm64'\n if [[ ${CURRENT_ARCH} =~ \"arm64e\" ]]\n then\n archType='arm64e'\n fi\nfi\n\n/usr/local/coremake/bin/gas-preprocessor.pl -x assembler-with-cpp ${INPUT_FILE_PATH} -arch $archType $include_paths -c -o ${SCRIPT_OUTPUT_FILE_0}\n";
PRINTNL };
PRINTNL F192372A2301CF0E004F37E9 /* PBXBuildRule */ = {
PRINTNL isa = PBXBuildRule;
PRINTNL compilerSpec = com.apple.compilers.proxy.script;
PRINTNL fileType = sourcecode.asm.asm;
PRINTNL isEditable = 1;
PRINTNL outputFiles = (
PRINTNL "${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
PRINTNL );
PRINTNL script = "ARRAY=(${USER_HEADER_SEARCH_PATHS})\n\ninclude_paths=\"\"\nfor i in \"${ARRAY[@]}\"\ndo\ninclude_paths=$include_paths\"-I\"$i\" \"\ndone\n\n/usr/local/bin/yasm ${INPUT_FILE_PATH} -fmacho64 $include_paths -D_HIDDEN -D_MACHO -DPIC -DARCH_X86_64 -o ${SCRIPT_OUTPUT_FILE_0}\n";

PRINTNL };

ELSE
PRINTNL F192372A2301CF0E004F37E9 /* PBXBuildRule */ = {
PRINTNL isa = PBXBuildRule;
PRINTNL compilerSpec = com.apple.compilers.proxy.script;
PRINTNL fileType = sourcecode.asm.asm;
PRINTNL isEditable = 1;
PRINTNL outputFiles = (
PRINTNL "${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}/${INPUT_FILE_BASE}.o",
PRINTNL );
PRINTNL script = "ARRAY=(${USER_HEADER_SEARCH_PATHS})\n\ninclude_paths=\"\"\nfor i in \"${ARRAY[@]}\"\ndo\ninclude_paths=$include_paths\"-I\"$i\" \"\ndone\n\n/usr/local/bin/yasm ${INPUT_FILE_PATH} -fmacho64 $include_paths -D_HIDDEN -D_MACHO -DPIC -DARCH_X86_64 -o ${SCRIPT_OUTPUT_FILE_0}\n";

PRINTNL };
ENDIF
PRINTNL /* End PBXBuildRule section */
PRINTNL
IFNDEF USE_MAKEFILE
PRINTNL /* Begin PBXNativeTarget section */
Expand All @@ -400,6 +440,14 @@ FOR EACH WORKSPACE
ENDIF
PRINTNL );
PRINTNL buildRules = (
IF (%(TYPE)==DLL || %(TYPE)==LIB)
IFDEF TARGET_IPHONE
PRINTNL F192372A2301CF0E004F37E9 /* PBXBuildRule */,
PRINTNL F1B8878A22FE0D360002351B /* PBXBuildRule */,
ELSE
PRINTNL F192372A2301CF0E004F37E9 /* PBXBuildRule */,
ENDIF
ENDIF
PRINTNL );
PRINTNL dependencies = (
FOR EACH USE
Expand Down Expand Up @@ -628,13 +676,16 @@ FOR EACH WORKSPACE
IFDEF TARGET_IPHONE
PRINTNL GCC_THUMB_SUPPORT = NO;
IF %(IOSDEPLOYMENTTARGET)!=""
PRINTNL IPHONEOS_DEPLOYMENT_TARGET = %(IOSDEPLOYMENTTARGET);
PRINTNL IPHONEOS_DEPLOYMENT_TARGET = %(IOSDEPLOYMENTTARGET);
ENDIF
PRINTNL MACOSX_DEPLOYMENT_TARGET = "";
IF (%(TYPE)==EXE)
PRINTNL "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
PRINTNL IPHONE_OPTIMIZE_OPTIONS = "-skip-PNGs";
ENDIF
ELSE
IF %(MACDEPLOYMENTTARGET)!=""
PRINTNL MACOSX_DEPLOYMENT_TARGET = %(MACDEPLOYMENTTARGET);
ENDIF
ENDIF
IF %(ASMFLAGS)!=""
PRINTNL YASM_OTHER_FLAGS = "%(ASMFLAGS)";
Expand Down Expand Up @@ -719,13 +770,16 @@ FOR EACH WORKSPACE
IFDEF TARGET_IPHONE
PRINTNL GCC_THUMB_SUPPORT = NO;
IF %(IOSDEPLOYMENTTARGET)!=""
PRINTNL IPHONEOS_DEPLOYMENT_TARGET = %(IOSDEPLOYMENTTARGET);
PRINTNL IPHONEOS_DEPLOYMENT_TARGET = %(IOSDEPLOYMENTTARGET);
ENDIF
PRINTNL MACOSX_DEPLOYMENT_TARGET = "";
IF (%(TYPE)==EXE)
PRINTNL "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
PRINTNL IPHONE_OPTIMIZE_OPTIONS = "-skip-PNGs";
ENDIF
ELSE
IF %(MACDEPLOYMENTTARGET)!=""
PRINTNL MACOSX_DEPLOYMENT_TARGET = %(MACDEPLOYMENTTARGET);
ENDIF
ENDIF
IF %(DEFINE) || %(DEFINE_DEBUG)
PRINTNL GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down
4 changes: 2 additions & 2 deletions xcode_ios.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
#define TARGET_ALWAYS_STATIC

SDK = iphoneos
IOSDEPLOYMENTTARGET = 6.0
IOSDEPLOYMENTTARGET = 8.0
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
XCODECOMPATVERSION = 3.2
DEVICEFAMILY = 1
ARCHS = "$(ARCHS_STANDARD)"
ARCHS = "$(ARCHS_STANDARD) arm64e"

#include "xcode.inc"
2 changes: 1 addition & 1 deletion xcode_ios_simu.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#define TARGET_ALWAYS_STATIC

SDK = iphonesimulator
IOSDEPLOYMENTTARGET = 6.0
IOSDEPLOYMENTTARGET = 8.0
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
XCODECOMPATVERSION = 3.2
ARCHS = "$(ARCHS_STANDARD)"
Expand Down
1 change: 1 addition & 0 deletions xcode_macosx.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ FRAMEWORK_PATH = /
GCC_VERSION = com.apple.compilers.llvm.clang.1_0
XCODECOMPATVERSION = 3.2
ARCHS = "$(ARCHS_STANDARD)"
MACDEPLOYMENTTARGET = 10.10

#include "xcode.inc"