Skip to content

Commit 347348f

Browse files
lmbelolmbelo
authored
Moving Linux arch to the standard project structure (Embarcadero#84)
1 parent 12a5456 commit 347348f

File tree

7 files changed

+28
-1301
lines changed

7 files changed

+28
-1301
lines changed

‎Packages/Delphi/Delphi 10.4+/Python.dproj‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<MainSource>Python.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{018AAA56-F5BD-4A04-BCCA-A0043EAAA5CE}</ProjectGuid>
10-
<ProjectName Condition="'$(ProjectName)'==''">Python</ProjectName>
1110
<ProjectVersion>20.1</ProjectVersion>
1211
<TargetedPlatforms>693395</TargetedPlatforms>
12+
<ProjectName Condition="'$(ProjectName)'==''">Python</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1515
<Base>true</Base>
@@ -55,6 +55,12 @@
5555
<Cfg_1>true</Cfg_1>
5656
<Base>true</Base>
5757
</PropertyGroup>
58+
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_1)'=='true') or '$(Cfg_1_iOSDevice64)'!=''">
59+
<Cfg_1_iOSDevice64>true</Cfg_1_iOSDevice64>
60+
<CfgParent>Cfg_1</CfgParent>
61+
<Cfg_1>true</Cfg_1>
62+
<Base>true</Base>
63+
</PropertyGroup>
5864
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
5965
<Cfg_1_Win64>true</Cfg_1_Win64>
6066
<CfgParent>Cfg_1</CfgParent>
@@ -137,6 +143,9 @@
137143
<VerInfo_Build>1</VerInfo_Build>
138144
<VerInfo_Keys>package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey=</VerInfo_Keys>
139145
</PropertyGroup>
146+
<PropertyGroup Condition="'$(Cfg_1_iOSDevice64)'!=''">
147+
<BT_BuildType>Debug</BT_BuildType>
148+
</PropertyGroup>
140149
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
141150
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
142151
<VerInfo_Keys>CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
@@ -205,14 +214,14 @@
205214
<Platforms>
206215
<Platform value="Android">True</Platform>
207216
<Platform value="Android64">True</Platform>
217+
<Platform value="iOSDevice64">True</Platform>
218+
<Platform value="iOSSimARM64">True</Platform>
208219
<Platform value="Linux64">True</Platform>
209220
<Platform value="OSX64">True</Platform>
210221
<Platform value="OSXARM64">True</Platform>
211222
<Platform value="Win32">True</Platform>
212223
<Platform value="Win64">True</Platform>
213224
<Platform value="Win64x">False</Platform>
214-
<Platform value="iOSDevice64">True</Platform>
215-
<Platform value="iOSSimARM64">True</Platform>
216225
</Platforms>
217226
</BorlandProject>
218227
<ProjectFileVersion>12</ProjectFileVersion>

‎Packages/Delphi/Delphi 10.4+/PythonFmx.dproj‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<MainSource>PythonFmx.dpk</MainSource>
88
<Platform Condition="'$(Platform)'==''">Win32</Platform>
99
<ProjectGuid>{513BF750-373D-4C95-A672-78CA8DDF3F63}</ProjectGuid>
10-
<ProjectName Condition="'$(ProjectName)'==''">PythonFmx</ProjectName>
1110
<ProjectVersion>20.1</ProjectVersion>
12-
<TargetedPlatforms>693267</TargetedPlatforms>
11+
<TargetedPlatforms>693395</TargetedPlatforms>
12+
<ProjectName Condition="'$(ProjectName)'==''">PythonFmx</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1515
<Base>true</Base>
@@ -60,6 +60,12 @@
6060
<CfgParent>Base</CfgParent>
6161
<Base>true</Base>
6262
</PropertyGroup>
63+
<PropertyGroup Condition="('$(Platform)'=='iOSDevice64' and '$(Cfg_2)'=='true') or '$(Cfg_2_iOSDevice64)'!=''">
64+
<Cfg_2_iOSDevice64>true</Cfg_2_iOSDevice64>
65+
<CfgParent>Cfg_2</CfgParent>
66+
<Cfg_2>true</Cfg_2>
67+
<Base>true</Base>
68+
</PropertyGroup>
6369
<PropertyGroup Condition="'$(Base)'!=''">
6470
<SanitizedProjectName>PythonFmx</SanitizedProjectName>
6571
<DCC_DcuOutput>..\..\..\lib\$(Platform)\$(Config)</DCC_DcuOutput>
@@ -127,6 +133,9 @@
127133
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
128134
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
129135
</PropertyGroup>
136+
<PropertyGroup Condition="'$(Cfg_2_iOSDevice64)'!=''">
137+
<BT_BuildType>Debug</BT_BuildType>
138+
</PropertyGroup>
130139
<ItemGroup>
131140
<DelphiCompile Include="$(MainSource)">
132141
<MainSource>MainSource</MainSource>
@@ -185,14 +194,14 @@
185194
<Platforms>
186195
<Platform value="Android">True</Platform>
187196
<Platform value="Android64">True</Platform>
188-
<Platform value="Linux64">False</Platform>
197+
<Platform value="iOSDevice64">True</Platform>
198+
<Platform value="iOSSimARM64">True</Platform>
199+
<Platform value="Linux64">True</Platform>
189200
<Platform value="OSX64">True</Platform>
190201
<Platform value="OSXARM64">True</Platform>
191202
<Platform value="Win32">True</Platform>
192203
<Platform value="Win64">True</Platform>
193204
<Platform value="Win64x">False</Platform>
194-
<Platform value="iOSDevice64">True</Platform>
195-
<Platform value="iOSSimARM64">True</Platform>
196205
</Platforms>
197206
</BorlandProject>
198207
<ProjectFileVersion>12</ProjectFileVersion>

‎Packages/Delphi/Delphi 10.4+/PythonFmxLinux.dpk‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)