Skip to content

Commit b68966e

Browse files
committed
Restore Win64 Delphi configuration
1 parent f64c504 commit b68966e

File tree

2 files changed

+162
-15
lines changed

2 files changed

+162
-15
lines changed

Test/openssl-client/delphi_openssl_client.dproj

Lines changed: 73 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,35 @@
55
<FrameworkType>None</FrameworkType>
66
<MainSource>delphi_openssl_client.dpr</MainSource>
77
<Base>True</Base>
8-
<Config Condition="'$(Config)'==''">Debug</Config>
8+
<Config Condition="'$(Config)'==''">Release</Config>
99
<Platform Condition="'$(Platform)'==''">Win32</Platform>
10-
<TargetedPlatforms>1</TargetedPlatforms>
10+
<TargetedPlatforms>3</TargetedPlatforms>
1111
<AppType>Console</AppType>
1212
<ProjectName Condition="'$(ProjectName)'==''">delphi_openssl_client</ProjectName>
1313
</PropertyGroup>
1414
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
1515
<Base>true</Base>
1616
</PropertyGroup>
17+
<PropertyGroup Condition="('$(Platform)'=='Android' and '$(Base)'=='true') or '$(Base_Android)'!=''">
18+
<Base_Android>true</Base_Android>
19+
<CfgParent>Base</CfgParent>
20+
<Base>true</Base>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="('$(Platform)'=='Android64' and '$(Base)'=='true') or '$(Base_Android64)'!=''">
23+
<Base_Android64>true</Base_Android64>
24+
<CfgParent>Base</CfgParent>
25+
<Base>true</Base>
26+
</PropertyGroup>
1727
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
1828
<Base_Win32>true</Base_Win32>
1929
<CfgParent>Base</CfgParent>
2030
<Base>true</Base>
2131
</PropertyGroup>
32+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
33+
<Base_Win64>true</Base_Win64>
34+
<CfgParent>Base</CfgParent>
35+
<Base>true</Base>
36+
</PropertyGroup>
2237
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
2338
<Cfg_1>true</Cfg_1>
2439
<CfgParent>Base</CfgParent>
@@ -30,6 +45,12 @@
3045
<Cfg_1>true</Cfg_1>
3146
<Base>true</Base>
3247
</PropertyGroup>
48+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
49+
<Cfg_1_Win64>true</Cfg_1_Win64>
50+
<CfgParent>Cfg_1</CfgParent>
51+
<Cfg_1>true</Cfg_1>
52+
<Base>true</Base>
53+
</PropertyGroup>
3354
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
3455
<Cfg_2>true</Cfg_2>
3556
<CfgParent>Base</CfgParent>
@@ -41,6 +62,12 @@
4162
<Cfg_2>true</Cfg_2>
4263
<Base>true</Base>
4364
</PropertyGroup>
65+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
66+
<Cfg_2_Win64>true</Cfg_2_Win64>
67+
<CfgParent>Cfg_2</CfgParent>
68+
<Cfg_2>true</Cfg_2>
69+
<Base>true</Base>
70+
</PropertyGroup>
4471
<PropertyGroup Condition="'$(Base)'!=''">
4572
<SanitizedProjectName>delphi_openssl_client</SanitizedProjectName>
4673
<DCC_Namespace>System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace)</DCC_Namespace>
@@ -53,6 +80,18 @@
5380
<DCC_K>false</DCC_K>
5481
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
5582
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Base_Android)'!=''">
84+
<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>
85+
<BT_BuildType>Debug</BT_BuildType>
86+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
87+
<EnabledSysJars>activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar</EnabledSysJars>
88+
</PropertyGroup>
89+
<PropertyGroup Condition="'$(Base_Android64)'!=''">
90+
<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>
91+
<BT_BuildType>Debug</BT_BuildType>
92+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
93+
<EnabledSysJars>activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar</EnabledSysJars>
94+
</PropertyGroup>
5695
<PropertyGroup Condition="'$(Base_Win32)'!=''">
5796
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
5897
<VerInfo_Locale>1033</VerInfo_Locale>
@@ -64,6 +103,16 @@
64103
<Manifest_File>(None)</Manifest_File>
65104
<AppDPIAwarenessMode>none</AppDPIAwarenessMode>
66105
</PropertyGroup>
106+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
107+
<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
108+
<BT_BuildType>Debug</BT_BuildType>
109+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
110+
<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>
111+
<VerInfo_Locale>1033</VerInfo_Locale>
112+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
113+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
114+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
115+
</PropertyGroup>
67116
<PropertyGroup Condition="'$(Cfg_1)'!=''">
68117
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
69118
<DCC_DebugDCUs>true</DCC_DebugDCUs>
@@ -87,6 +136,12 @@
87136
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
88137
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
89138
</PropertyGroup>
139+
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
140+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
141+
<UsePackages>true</UsePackages>
142+
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
143+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
144+
</PropertyGroup>
90145
<PropertyGroup Condition="'$(Cfg_2)'!=''">
91146
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
92147
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
@@ -102,23 +157,30 @@
102157
<UsePackages>true</UsePackages>
103158
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
104159
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
160+
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
161+
</PropertyGroup>
162+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
163+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
164+
<UsePackages>true</UsePackages>
165+
<DCC_UsePackage>IndySystem290;IndyCore290;IndyProtocols290;IndyTLSOpenSSL290;$(DCC_UsePackage)</DCC_UsePackage>
166+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
105167
</PropertyGroup>
106168
<ItemGroup>
107169
<DelphiCompile Include="$(MainSource)">
108170
<MainSource>MainSource</MainSource>
109171
</DelphiCompile>
110172
<DCCReference Include="TestClient.pas"/>
111-
<BuildConfiguration Include="Release">
112-
<Key>Cfg_2</Key>
113-
<CfgParent>Base</CfgParent>
114-
</BuildConfiguration>
115173
<BuildConfiguration Include="Base">
116174
<Key>Base</Key>
117175
</BuildConfiguration>
118176
<BuildConfiguration Include="Debug">
119177
<Key>Cfg_1</Key>
120178
<CfgParent>Base</CfgParent>
121179
</BuildConfiguration>
180+
<BuildConfiguration Include="Release">
181+
<Key>Cfg_2</Key>
182+
<CfgParent>Base</CfgParent>
183+
</BuildConfiguration>
122184
</ItemGroup>
123185
<ProjectExtensions>
124186
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -129,12 +191,15 @@
129191
<Source Name="MainSource">delphi_openssl_client.dpr</Source>
130192
</Source>
131193
<Excluded_Packages>
132-
<Excluded_Packages Name="$(BDSBIN)\dclIndyCore240.bpl">Indy 10 Core Design Time</Excluded_Packages>
133-
<Excluded_Packages Name="$(BDSBIN)\dclIndyProtocols240.bpl">Indy 10 Protocols Design Time</Excluded_Packages>
194+
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k290.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
195+
<Excluded_Packages Name="$(BDSBIN)\dclofficexp290.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
134196
</Excluded_Packages>
135197
</Delphi.Personality>
136198
<Platforms>
199+
<Platform value="Android">False</Platform>
200+
<Platform value="Android64">False</Platform>
137201
<Platform value="Win32">True</Platform>
202+
<Platform value="Win64">True</Platform>
138203
</Platforms>
139204
<Deployment Version="4">
140205
<DeployFile LocalName="$(BDS)\Redist\iossimulator\libcgunwind.1.0.dylib" Class="DependencyModule">

0 commit comments

Comments
 (0)