pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

iphonelazext: updated TargetCPU to %CPUTARGET templates replacement when processing compiler project options

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5263 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2016-10-16 07:08:23 +00:00
parent 4344765090
commit 755117f397
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/iphonelazext/xcodetemplate.pas
View File

@ -322,13 +322,18 @@ end;
function isCPUorOS(const s: string): boolean; function isCPUorOS(const s: string): boolean;
begin 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; end;
function ResolveCPUOS(const s: string; const cpu, os: string): string; function ResolveCPUOS(const s: string; const cpu, os: string): string;
begin begin
Result:=StringReplace(s, '$(TargetCPU)', cpu, [rfReplaceAll, rfIgnoreCase]); Result:=StringReplace(s, '$(TargetCPU)', cpu, [rfReplaceAll, rfIgnoreCase]);
Result:=StringReplace(Result, '$(TargetOS)', os, [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; end;
procedure UpdateCompileOpts(const proj: PBXProject; const aoptions: string); procedure UpdateCompileOpts(const proj: PBXProject; const aoptions: string);