From 755117f3973c08c5c63bfe2bde24d3300953d574 Mon Sep 17 00:00:00 2001 From: skalogryz Date: Sun, 16 Oct 2016 07:08:23 +0000 Subject: [PATCH] iphonelazext: updated TargetCPU to %CPUTARGET templates replacement when processing compiler project options git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5263 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- components/iphonelazext/xcodetemplate.pas | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/components/iphonelazext/xcodetemplate.pas b/components/iphonelazext/xcodetemplate.pas index 48189bdf7..3a01f410c 100644 --- a/components/iphonelazext/xcodetemplate.pas +++ b/components/iphonelazext/xcodetemplate.pas @@ -322,13 +322,18 @@ end; function isCPUorOS(const s: string): boolean; begin - Result:=(Pos('$(TargetCPU)', s)>0) or (Pos('$(TargetOS)', s)>0) + Result:=(Pos('$(TargetCPU)', s)>0) + or (Pos('$(TargetOS)', s)>0) + or (Pos('%(CPU_TARGET)', s)>0) + or (Pos('%(OS_TARGET)', s)>0) end; function ResolveCPUOS(const s: string; const cpu, os: string): string; begin Result:=StringReplace(s, '$(TargetCPU)', cpu, [rfReplaceAll, rfIgnoreCase]); Result:=StringReplace(Result, '$(TargetOS)', os, [rfReplaceAll, rfIgnoreCase]); + Result:=StringReplace(s, '%(CPU_TARGET)', cpu, [rfReplaceAll, rfIgnoreCase]); + Result:=StringReplace(Result, '%(OS_TARGET)', os, [rfReplaceAll, rfIgnoreCase]); end; procedure UpdateCompileOpts(const proj: PBXProject; const aoptions: string);