Skip to content

Commit ec59c9f

Browse files
danieletetidanieleteti
committed
v2.2
1 parent ece7275 commit ec59c9f

File tree

3 files changed

+209
-87
lines changed

3 files changed

+209
-87
lines changed

‎samples/01CmdsSample/CmdsSample.dproj

Lines changed: 76 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<TargetedPlatforms>129</TargetedPlatforms>
88
<AppType>Console</AppType>
99
<FrameworkType>None</FrameworkType>
10-
<ProjectVersion>19.1</ProjectVersion>
10+
<ProjectVersion>19.3</ProjectVersion>
1111
<Platform Condition="'$(Platform)'==''">Win32</Platform>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -44,6 +44,12 @@
4444
<Cfg_2>true</Cfg_2>
4545
<Base>true</Base>
4646
</PropertyGroup>
47+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
48+
<Cfg_2_Win32>true</Cfg_2_Win32>
49+
<CfgParent>Cfg_2</CfgParent>
50+
<Cfg_2>true</Cfg_2>
51+
<Base>true</Base>
52+
</PropertyGroup>
4753
<PropertyGroup Condition="'$(Base)'!=''">
4854
<Icns_MainIcns>$(BDS)\bin\delphi_PROJECTICNS.icns</Icns_MainIcns>
4955
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName=</VerInfo_Keys>
@@ -57,6 +63,7 @@
5763
<VerInfo_Locale>1040</VerInfo_Locale>
5864
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
5965
<DCC_F>false</DCC_F>
66+
<DCC_UnitSearchPath>..\..\sources;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6067
</PropertyGroup>
6168
<PropertyGroup Condition="'$(Base_Android)'!=''">
6269
<Android_LauncherIcon96>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_96x96.png</Android_LauncherIcon96>
@@ -86,6 +93,7 @@
8693
<Android_NotificationIcon48>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_48x48.png</Android_NotificationIcon48>
8794
<Android_NotificationIcon72>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_72x72.png</Android_NotificationIcon72>
8895
<Android_NotificationIcon96>$(BDS)\bin\Artwork\Android\FM_NotificationIcon_96x96.png</Android_NotificationIcon96>
96+
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
8997
</PropertyGroup>
9098
<PropertyGroup Condition="'$(Base_Android64)'!=''">
9199
<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>
@@ -113,6 +121,7 @@
113121
<AUP_ACCESS_COARSE_LOCATION>true</AUP_ACCESS_COARSE_LOCATION>
114122
<AUP_READ_EXTERNAL_STORAGE>true</AUP_READ_EXTERNAL_STORAGE>
115123
<Android_SplashImage426>$(BDS)\bin\Artwork\Android\FM_SplashImage_426x320.png</Android_SplashImage426>
124+
<Android_LauncherIcon192>$(BDS)\bin\Artwork\Android\FM_LauncherIcon_192x192.png</Android_LauncherIcon192>
116125
</PropertyGroup>
117126
<PropertyGroup Condition="'$(Base_Win32)'!=''">
118127
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(ModuleName);FileDescription=$(ModuleName);ProductName=$(ModuleName)</VerInfo_Keys>
@@ -134,21 +143,26 @@
134143
<Debugger_UseLauncher>true</Debugger_UseLauncher>
135144
<Debugger_Launcher>/usr/bin/xterm -e &quot;%debuggee%&quot;</Debugger_Launcher>
136145
</PropertyGroup>
146+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
147+
<VerInfo_Locale>1033</VerInfo_Locale>
148+
<VerInfo_Keys>CompanyName=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName);FileDescription=$(MSBuildProjectName);ProductName=$(MSBuildProjectName)</VerInfo_Keys>
149+
<Manifest_File>(None)</Manifest_File>
150+
</PropertyGroup>
137151
<ItemGroup>
138152
<DelphiCompile Include="$(MainSource)">
139153
<MainSource>MainSource</MainSource>
140154
</DelphiCompile>
141-
<BuildConfiguration Include="Debug">
142-
<Key>Cfg_2</Key>
143-
<CfgParent>Base</CfgParent>
144-
</BuildConfiguration>
145155
<BuildConfiguration Include="Base">
146156
<Key>Base</Key>
147157
</BuildConfiguration>
148158
<BuildConfiguration Include="Release">
149159
<Key>Cfg_1</Key>
150160
<CfgParent>Base</CfgParent>
151161
</BuildConfiguration>
162+
<BuildConfiguration Include="Debug">
163+
<Key>Cfg_2</Key>
164+
<CfgParent>Base</CfgParent>
165+
</BuildConfiguration>
152166
</ItemGroup>
153167
<ProjectExtensions>
154168
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -158,6 +172,12 @@
158172
<Source>
159173
<Source Name="MainSource">CmdsSample.dpr</Source>
160174
</Source>
175+
<Excluded_Packages>
176+
<Excluded_Packages Name="$(BDSBIN)\bcboffice2k280.bpl">Embarcadero C++Builder Office 2000 Servers Package</Excluded_Packages>
177+
<Excluded_Packages Name="$(BDSBIN)\bcbofficexp280.bpl">Embarcadero C++Builder Office XP Servers Package</Excluded_Packages>
178+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k280.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
179+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp280.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
180+
</Excluded_Packages>
161181
</Delphi.Personality>
162182
<Platforms>
163183
<Platform value="Android">False</Platform>
@@ -167,24 +187,20 @@
167187
<Platform value="Win64">False</Platform>
168188
</Platforms>
169189
<Deployment Version="3">
170-
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
171-
<Platform Name="OSX32">
172-
<Overwrite>true</Overwrite>
173-
</Platform>
174-
</DeployFile>
175190
<DeployFile LocalName="CmdsSample" Configuration="Debug" Class="ProjectOutput">
176191
<Platform Name="Linux64">
177192
<RemoteName>CmdsSample</RemoteName>
178193
<Overwrite>true</Overwrite>
179194
</Platform>
180195
</DeployFile>
181-
<DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
182-
<Platform Name="OSX64">
196+
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
197+
<Platform Name="iOSSimulator">
183198
<Overwrite>true</Overwrite>
184199
</Platform>
185200
</DeployFile>
186-
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libPCRE.dylib" Class="DependencyModule">
187-
<Platform Name="iOSSimulator">
201+
<DeployFile LocalName="CmdsSample.exe" Configuration="Debug" Class="ProjectOutput">
202+
<Platform Name="Win32">
203+
<RemoteName>CmdsSample.exe</RemoteName>
188204
<Overwrite>true</Overwrite>
189205
</Platform>
190206
</DeployFile>
@@ -193,9 +209,8 @@
193209
<Overwrite>true</Overwrite>
194210
</Platform>
195211
</DeployFile>
196-
<DeployFile LocalName="CmdsSample.exe" Configuration="Debug" Class="ProjectOutput">
197-
<Platform Name="Win32">
198-
<RemoteName>CmdsSample.exe</RemoteName>
212+
<DeployFile LocalName="$(BDS)\Redist\osx32\libcgunwind.1.0.dylib" Class="DependencyModule">
213+
<Platform Name="OSX32">
199214
<Overwrite>true</Overwrite>
200215
</Platform>
201216
</DeployFile>
@@ -209,6 +224,11 @@
209224
<Overwrite>true</Overwrite>
210225
</Platform>
211226
</DeployFile>
227+
<DeployFile LocalName="$(BDS)\Redist\osx64\libcgsqlite3.dylib" Class="DependencyModule">
228+
<Platform Name="OSX64">
229+
<Overwrite>true</Overwrite>
230+
</Platform>
231+
</DeployFile>
212232
<DeployClass Name="AdditionalDebugSymbols">
213233
<Platform Name="OSX32">
214234
<Operation>1</Operation>
@@ -217,6 +237,16 @@
217237
<Operation>0</Operation>
218238
</Platform>
219239
</DeployClass>
240+
<DeployClass Name="AndroidClasses">
241+
<Platform Name="Android">
242+
<RemoteDir>classes</RemoteDir>
243+
<Operation>64</Operation>
244+
</Platform>
245+
<Platform Name="Android64">
246+
<RemoteDir>classes</RemoteDir>
247+
<Operation>64</Operation>
248+
</Platform>
249+
</DeployClass>
220250
<DeployClass Name="AndroidClassesDexFile">
221251
<Platform Name="Android">
222252
<RemoteDir>classes</RemoteDir>
@@ -515,6 +545,10 @@
515545
<Operation>1</Operation>
516546
<Extensions>.framework</Extensions>
517547
</Platform>
548+
<Platform Name="OSXARM64">
549+
<Operation>1</Operation>
550+
<Extensions>.framework</Extensions>
551+
</Platform>
518552
<Platform Name="Win32">
519553
<Operation>0</Operation>
520554
</Platform>
@@ -528,6 +562,10 @@
528562
<Operation>1</Operation>
529563
<Extensions>.dylib</Extensions>
530564
</Platform>
565+
<Platform Name="OSXARM64">
566+
<Operation>1</Operation>
567+
<Extensions>.dylib</Extensions>
568+
</Platform>
531569
<Platform Name="Win32">
532570
<Operation>0</Operation>
533571
<Extensions>.dll;.bpl</Extensions>
@@ -554,6 +592,10 @@
554592
<Operation>1</Operation>
555593
<Extensions>.dylib</Extensions>
556594
</Platform>
595+
<Platform Name="OSXARM64">
596+
<Operation>1</Operation>
597+
<Extensions>.dylib</Extensions>
598+
</Platform>
557599
<Platform Name="Win32">
558600
<Operation>0</Operation>
559601
<Extensions>.bpl</Extensions>
@@ -581,6 +623,9 @@
581623
<Platform Name="OSX64">
582624
<Operation>0</Operation>
583625
</Platform>
626+
<Platform Name="OSXARM64">
627+
<Operation>0</Operation>
628+
</Platform>
584629
<Platform Name="Win32">
585630
<Operation>0</Operation>
586631
</Platform>
@@ -1134,6 +1179,10 @@
11341179
<RemoteDir>Contents\Resources</RemoteDir>
11351180
<Operation>1</Operation>
11361181
</Platform>
1182+
<Platform Name="OSXARM64">
1183+
<RemoteDir>Contents\Resources</RemoteDir>
1184+
<Operation>1</Operation>
1185+
</Platform>
11371186
</DeployClass>
11381187
<DeployClass Required="true" Name="ProjectOutput">
11391188
<Platform Name="Android">
@@ -1162,6 +1211,9 @@
11621211
<Platform Name="OSX64">
11631212
<Operation>1</Operation>
11641213
</Platform>
1214+
<Platform Name="OSXARM64">
1215+
<Operation>1</Operation>
1216+
</Platform>
11651217
<Platform Name="Win32">
11661218
<Operation>0</Operation>
11671219
</Platform>
@@ -1200,16 +1252,17 @@
12001252
<Operation>1</Operation>
12011253
</Platform>
12021254
</DeployClass>
1203-
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
1255+
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
1256+
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
1257+
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1258+
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
1259+
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
12041260
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
1261+
<ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME)"/>
12051262
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
1263+
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
12061264
<ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
1207-
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
1208-
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME)"/>
1209-
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
1210-
<ProjectRoot Platform="OSX64" Name="$(PROJECTNAME)"/>
12111265
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
1212-
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
12131266
</Deployment>
12141267
</BorlandProject>
12151268
<ProjectFileVersion>12</ProjectFileVersion>

0 commit comments

Comments
 (0)