Skip to content

Commit 17d7642

Browse files
viniciusfbbviniciusfbb
committed
[Setup] Fix pre-support for RAD Studio 13 Florence
1 parent be9152b commit 17d7642

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

‎Benchmark/FmxFPS/Projects/RAD Studio 13 Florence/FmxFPS.dproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!--
1+
<!--
22
Copyright (c) 2021-2025 Skia4Delphi Project.
33

44
Use of this source code is governed by the MIT license that can be
@@ -11,7 +11,7 @@
1111
<Config Condition="'$(Config)'==''">Release</Config>
1212
<FrameworkType>FMX</FrameworkType>
1313
<MainSource>FmxFPS.dpr</MainSource>
14-
<Platform Condition="'$(Platform)'==''">Win32</Platform>
14+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
1515
<ProjectGuid>{0A2966CD-996C-4EB4-BAD4-2546D657F13A}</ProjectGuid>
1616
<ProjectName Condition="'$(ProjectName)'==''">FmxFPS</ProjectName>
1717
<ProjectVersion>20.3</ProjectVersion>

‎Tools/Setup/Source/RADStudio.Build.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ end;
5656

5757
function GetPlatformsAllowedToBuild(const ARADStudioInfo: TRADStudioInfo): TProjectPlatforms;
5858
begin
59-
Result := [pfWin32, pfWin64];
59+
Result := [pfWin32, pfWin64, pfWin64x];
6060
end;
6161

6262
function GetTryBuildRADStudioPackagesSteps(const ARADStudioInfos: TRADStudioInfos; const AGroupProjects: TRADStudioGroupProjects): Integer;

‎Tools/Setup/Source/RADStudio.Project.inc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// interface
1818

1919
type
20-
TProjectPlatform = (pfWin32, pfWin64, pfAndroid, pfAndroid64, pfiOSDevice32, pfiOSDevice64, pfiOSSimARM64, pfiOSSimulator, pfOSX32, pfOSX64, pfOSXARM64, pfLinux64);
20+
TProjectPlatform = (pfWin32, pfWin64, pfWin64x, pfAndroid, pfAndroid64, pfiOSDevice32, pfiOSDevice64, pfiOSSimARM64, pfiOSSimulator, pfOSX32, pfOSX64, pfOSXARM64, pfLinux64);
2121
TProjectPlatforms = set of TProjectPlatform;
2222
TProjectConfig = (pcDebug, pcRelease);
2323
TProjectConfigs = set of TProjectConfig;
@@ -171,6 +171,7 @@ begin
171171
case APlatform of
172172
pfWin32 : Result := 'Windows 32-bit';
173173
pfWin64 : Result := 'Windows 64-bit';
174+
pfWin64x : Result := 'Windows 64-bit (Modern)';
174175
pfAndroid : Result := 'Android 32-bit';
175176
pfAndroid64 : Result := 'Android 64-bit';
176177
pfiOSDevice32 : Result := 'iOS Device 32-bit';
@@ -201,6 +202,7 @@ begin
201202
case APlatform of
202203
pfWin32 : Result := 'Win32';
203204
pfWin64 : Result := 'Win64';
205+
pfWin64x : Result := 'Win64x';
204206
pfAndroid : Result := 'Android';
205207
pfAndroid64 : Result := 'Android64';
206208
pfiOSDevice32 : Result := 'iOSDevice32';
@@ -512,6 +514,8 @@ begin
512514
APlatform := pfWin32
513515
else if SameText(APlatformName, 'Win64') then
514516
APlatform := pfWin64
517+
else if SameText(APlatformName, 'Win64x') then
518+
APlatform := pfWin64x
515519
else if SameText(APlatformName, 'Android') then
516520
APlatform := pfAndroid
517521
else if SameText(APlatformName, 'Android32') then

‎Tools/Setup/Source/RADStudio.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ begin
532532
// RAD Studio 12 Athens
533533
LRADStudioVersion.Name := 'RAD Studio 12 Athens';
534534
LRADStudioVersion.RegVersion := '23.0';
535-
LRADStudioVersion.SupportedPlatformsDelphi := [pfWin32, pfWin64, pfAndroid, pfAndroid64, pfiOSDevice64, pfiOSSimARM64, pfiOSSimulator, pfOSX64, pfOSXARM64, pfLinux64];
535+
LRADStudioVersion.SupportedPlatformsDelphi := [pfWin32, pfWin64, pfWin64x, pfAndroid, pfAndroid64, pfiOSDevice64, pfiOSSimARM64, pfOSX64, pfOSXARM64, pfLinux64];
536536
LRADStudioVersion.SupportedPlatforms := LRADStudioVersion.SupportedPlatformsDelphi;
537537
LRADStudioVersion.MaxDprojVersion := '20.1';
538538
LRADStudioVersion.MinDprojVersion := '20.1';
@@ -548,7 +548,7 @@ begin
548548
// RAD Studio 13 Florence
549549
LRADStudioVersion.Name := 'RAD Studio 13 Florence';
550550
LRADStudioVersion.RegVersion := '37.0';
551-
LRADStudioVersion.SupportedPlatformsDelphi := [pfWin32, pfWin64, pfAndroid, pfAndroid64, pfiOSDevice64, pfiOSSimARM64, pfiOSSimulator, pfOSX64, pfOSXARM64, pfLinux64];
551+
LRADStudioVersion.SupportedPlatformsDelphi := [pfWin32, pfWin64, pfWin64x, pfAndroid, pfAndroid64, pfiOSDevice64, pfiOSSimARM64, pfOSX64, pfOSXARM64, pfLinux64];
552552
LRADStudioVersion.SupportedPlatforms := LRADStudioVersion.SupportedPlatformsDelphi;
553553
LRADStudioVersion.MaxDprojVersion := '20.3';
554554
LRADStudioVersion.MinDprojVersion := '20.3';

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy