Skip to content

Commit b556413

Browse files
committed
Merge branch 'main' into net-http
2 parents d28f699 + b2e1617 commit b556413

16 files changed

+129
-108
lines changed

samples/console/publisher/ConsolePublisher.dproj

Lines changed: 8 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,14 @@
55
<FrameworkType>None</FrameworkType>
66
<Base>True</Base>
77
<Config Condition="'$(Config)'==''">Debug</Config>
8-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9-
<TargetedPlatforms>1</TargetedPlatforms>
8+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
9+
<TargetedPlatforms>3</TargetedPlatforms>
1010
<AppType>Console</AppType>
1111
<MainSource>ConsolePublisher.dpr</MainSource>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
1515
</PropertyGroup>
16-
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
17-
<Base_Android>true</Base_Android>
18-
<CfgParent>Base</CfgParent>
19-
<Base>true</Base>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
22-
<Base_Android64>true</Base_Android64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
2616
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
2717
<Base_Win32>true</Base_Win32>
2818
<CfgParent>Base</CfgParent>
@@ -50,8 +40,8 @@
5040
<Base>true</Base>
5141
</PropertyGroup>
5242
<PropertyGroup Condition="'$(Base)'!=''">
53-
<DCC_DcuOutput>..\..\..\lib</DCC_DcuOutput>
54-
<DCC_ExeOutput>..\..\..\bin</DCC_ExeOutput>
43+
<DCC_DcuOutput>..\..\..\lib\$(Platform)</DCC_DcuOutput>
44+
<DCC_ExeOutput>..\..\..\bin\$(Platform)</DCC_ExeOutput>
5545
<DCC_E>false</DCC_E>
5646
<DCC_N>false</DCC_N>
5747
<DCC_S>false</DCC_S>
@@ -63,16 +53,6 @@
6353
<SanitizedProjectName>ConsolePublisher</SanitizedProjectName>
6454
<DCC_UnitSearchPath>..\..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6555
</PropertyGroup>
66-
<PropertyGroup Condition="'$(Base_Android)'!=''">
67-
<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>
68-
<BT_BuildType>Debug</BT_BuildType>
69-
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
70-
</PropertyGroup>
71-
<PropertyGroup Condition="'$(Base_Android64)'!=''">
72-
<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>
73-
<BT_BuildType>Debug</BT_BuildType>
74-
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
75-
</PropertyGroup>
7656
<PropertyGroup Condition="'$(Base_Win32)'!=''">
7757
<DCC_UsePackage>DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;bindcompvclsmp;tethering;svnui;bindcompvclwinx;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;FireDAC;vcltouch;vcldb;bindcompfmx;svn;FireDACSqliteDriver;FireDACPgDriver;inetdb;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;vcledge;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage)</DCC_UsePackage>
7858
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -87,6 +67,9 @@
8767
<DCC_ConsoleTarget>true</DCC_ConsoleTarget>
8868
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
8969
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
70+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
71+
<BT_BuildType>Debug</BT_BuildType>
72+
<Manifest_File>(None)</Manifest_File>
9073
</PropertyGroup>
9174
<PropertyGroup Condition="'$(Cfg_1)'!=''">
9275
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -943,10 +926,8 @@
943926
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
944927
</Deployment>
945928
<Platforms>
946-
<Platform value="Android">False</Platform>
947-
<Platform value="Android64">False</Platform>
948929
<Platform value="Win32">True</Platform>
949-
<Platform value="Win64">False</Platform>
930+
<Platform value="Win64">True</Platform>
950931
</Platforms>
951932
<ModelSupport>False</ModelSupport>
952933
</BorlandProject>
0 Bytes
Binary file not shown.

samples/console/subscriber/ConsoleSubscriber.dproj

Lines changed: 18 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,14 @@
55
<FrameworkType>None</FrameworkType>
66
<Base>True</Base>
77
<Config Condition="'$(Config)'==''">Debug</Config>
8-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
9-
<TargetedPlatforms>1</TargetedPlatforms>
8+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
9+
<TargetedPlatforms>3</TargetedPlatforms>
1010
<AppType>Console</AppType>
1111
<MainSource>ConsoleSubscriber.dpr</MainSource>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1414
<Base>true</Base>
1515
</PropertyGroup>
16-
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
17-
<Base_Android>true</Base_Android>
18-
<CfgParent>Base</CfgParent>
19-
<Base>true</Base>
20-
</PropertyGroup>
21-
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
22-
<Base_Android64>true</Base_Android64>
23-
<CfgParent>Base</CfgParent>
24-
<Base>true</Base>
25-
</PropertyGroup>
2616
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
2717
<Base_Win32>true</Base_Win32>
2818
<CfgParent>Base</CfgParent>
@@ -44,14 +34,20 @@
4434
<Cfg_1>true</Cfg_1>
4535
<Base>true</Base>
4636
</PropertyGroup>
37+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
38+
<Cfg_1_Win64>true</Cfg_1_Win64>
39+
<CfgParent>Cfg_1</CfgParent>
40+
<Cfg_1>true</Cfg_1>
41+
<Base>true</Base>
42+
</PropertyGroup>
4743
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
4844
<Cfg_2>true</Cfg_2>
4945
<CfgParent>Base</CfgParent>
5046
<Base>true</Base>
5147
</PropertyGroup>
5248
<PropertyGroup Condition="'$(Base)'!=''">
53-
<DCC_DcuOutput>..\..\..\lib</DCC_DcuOutput>
54-
<DCC_ExeOutput>..\..\..\bin</DCC_ExeOutput>
49+
<DCC_DcuOutput>..\..\..\lib\$(Platform)</DCC_DcuOutput>
50+
<DCC_ExeOutput>..\..\..\bin\$(Platform)</DCC_ExeOutput>
5551
<DCC_E>false</DCC_E>
5652
<DCC_N>false</DCC_N>
5753
<DCC_S>false</DCC_S>
@@ -63,16 +59,6 @@
6359
<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>
6460
<DCC_UnitSearchPath>..\..\..\src;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
6561
</PropertyGroup>
66-
<PropertyGroup Condition="'$(Base_Android)'!=''">
67-
<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>
68-
<BT_BuildType>Debug</BT_BuildType>
69-
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
70-
</PropertyGroup>
71-
<PropertyGroup Condition="'$(Base_Android64)'!=''">
72-
<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>
73-
<BT_BuildType>Debug</BT_BuildType>
74-
<EnabledSysJars>android-support-v4.dex.jar;cloud-messaging.dex.jar;com-google-android-gms.play-services-ads-base.17.2.0.dex.jar;com-google-android-gms.play-services-ads-identifier.16.0.0.dex.jar;com-google-android-gms.play-services-ads-lite.17.2.0.dex.jar;com-google-android-gms.play-services-ads.17.2.0.dex.jar;com-google-android-gms.play-services-analytics-impl.16.0.8.dex.jar;com-google-android-gms.play-services-analytics.16.0.8.dex.jar;com-google-android-gms.play-services-base.16.0.1.dex.jar;com-google-android-gms.play-services-basement.16.2.0.dex.jar;com-google-android-gms.play-services-gass.17.2.0.dex.jar;com-google-android-gms.play-services-identity.16.0.0.dex.jar;com-google-android-gms.play-services-maps.16.1.0.dex.jar;com-google-android-gms.play-services-measurement-base.16.4.0.dex.jar;com-google-android-gms.play-services-measurement-sdk-api.16.4.0.dex.jar;com-google-android-gms.play-services-stats.16.0.1.dex.jar;com-google-android-gms.play-services-tagmanager-v4-impl.16.0.8.dex.jar;com-google-android-gms.play-services-tasks.16.0.1.dex.jar;com-google-android-gms.play-services-wallet.16.0.1.dex.jar;com-google-firebase.firebase-analytics.16.4.0.dex.jar;com-google-firebase.firebase-common.16.1.0.dex.jar;com-google-firebase.firebase-iid-interop.16.0.1.dex.jar;com-google-firebase.firebase-iid.17.1.1.dex.jar;com-google-firebase.firebase-measurement-connector.17.0.1.dex.jar;com-google-firebase.firebase-messaging.17.5.0.dex.jar;fmx.dex.jar;google-play-billing.dex.jar;google-play-licensing.dex.jar</EnabledSysJars>
75-
</PropertyGroup>
7662
<PropertyGroup Condition="'$(Base_Win32)'!=''">
7763
<DCC_UsePackage>DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;bindcompvclsmp;tethering;svnui;bindcompvclwinx;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;FireDAC;vcltouch;vcldb;bindcompfmx;svn;FireDACSqliteDriver;FireDACPgDriver;inetdb;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;vcledge;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage)</DCC_UsePackage>
7864
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -88,6 +74,8 @@
8874
<DCC_ConsoleTarget>true</DCC_ConsoleTarget>
8975
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
9076
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
77+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
78+
<BT_BuildType>Debug</BT_BuildType>
9179
</PropertyGroup>
9280
<PropertyGroup Condition="'$(Cfg_1)'!=''">
9381
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -101,6 +89,11 @@
10189
<DCC_RemoteDebug>false</DCC_RemoteDebug>
10290
<Manifest_File>(None)</Manifest_File>
10391
</PropertyGroup>
92+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
93+
<DCC_DcuOutput>..\..\..\lib\$(Platform)</DCC_DcuOutput>
94+
<DCC_ExeOutput>..\..\..\bin\$(Platform)</DCC_ExeOutput>
95+
<Manifest_File>(None)</Manifest_File>
96+
</PropertyGroup>
10497
<PropertyGroup Condition="'$(Cfg_2)'!=''">
10598
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
10699
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
@@ -930,10 +923,8 @@
930923
<ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
931924
</Deployment>
932925
<Platforms>
933-
<Platform value="Android">False</Platform>
934-
<Platform value="Android64">False</Platform>
935926
<Platform value="Win32">True</Platform>
936-
<Platform value="Win64">False</Platform>
927+
<Platform value="Win64">True</Platform>
937928
</Platforms>
938929
</BorlandProject>
939930
<ProjectFileVersion>12</ProjectFileVersion>
0 Bytes
Binary file not shown.

samples/openssl/lib32Bits.zip

821 KB
Binary file not shown.

samples/openssl/lib64Bits.zip

1.12 MB
Binary file not shown.

0 commit comments

Comments
 (0)