Skip to content

Commit 1a6d956

Browse files
ReinierNLReinierNL
committed
Win64 is now the default platform; removed/replaced old icons; improved high DPI awareness; plus many modifications by Delphi
1 parent b0a03f5 commit 1a6d956

File tree

2 files changed

+162
-136
lines changed

2 files changed

+162
-136
lines changed

‎Demos/Demo25/VarPythUnitTest.dproj

+162-136
Original file line numberDiff line numberDiff line change
@@ -1,136 +1,162 @@
1-
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<PropertyGroup>
3-
<ProjectGuid>{F6960501-E313-4232-96B9-EA62FB351D5E}</ProjectGuid>
4-
<MainSource>VarPythUnitTest.dpr</MainSource>
5-
<Config Condition="'$(Config)'==''">Debug</Config>
6-
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7-
<ProjectVersion>13.4</ProjectVersion>
8-
<FrameworkType>VCL</FrameworkType>
9-
<Base>True</Base>
10-
<Platform Condition="'$(Platform)'==''">Win64</Platform>
11-
<TargetedPlatforms>3</TargetedPlatforms>
12-
<AppType>Application</AppType>
13-
</PropertyGroup>
14-
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15-
<Base>true</Base>
16-
</PropertyGroup>
17-
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
18-
<Base_Win64>true</Base_Win64>
19-
<CfgParent>Base</CfgParent>
20-
<Base>true</Base>
21-
</PropertyGroup>
22-
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
23-
<Cfg_1>true</Cfg_1>
24-
<CfgParent>Base</CfgParent>
25-
<Base>true</Base>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
28-
<Cfg_2>true</Cfg_2>
29-
<CfgParent>Base</CfgParent>
30-
<Base>true</Base>
31-
</PropertyGroup>
32-
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
33-
<Cfg_2_Win32>true</Cfg_2_Win32>
34-
<CfgParent>Cfg_2</CfgParent>
35-
<Cfg_2>true</Cfg_2>
36-
<Base>true</Base>
37-
</PropertyGroup>
38-
<PropertyGroup Condition="'$(Base)'!=''">
39-
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
40-
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
41-
<VerInfo_Locale>1033</VerInfo_Locale>
42-
<DCC_DependencyCheckOutputName>VarPythUnitTest.exe</DCC_DependencyCheckOutputName>
43-
<DCC_ImageBase>00400000</DCC_ImageBase>
44-
<DCC_Platform>x86</DCC_Platform>
45-
</PropertyGroup>
46-
<PropertyGroup Condition="'$(Base_Win64)'!=''">
47-
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
48-
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
49-
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
50-
</PropertyGroup>
51-
<PropertyGroup Condition="'$(Cfg_1)'!=''">
52-
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
53-
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
54-
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
55-
<DCC_DebugInformation>false</DCC_DebugInformation>
56-
</PropertyGroup>
57-
<PropertyGroup Condition="'$(Cfg_2)'!=''">
58-
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
59-
</PropertyGroup>
60-
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
61-
<Manifest_File>None</Manifest_File>
62-
</PropertyGroup>
63-
<ItemGroup>
64-
<DelphiCompile Include="$(MainSource)">
65-
<MainSource>MainSource</MainSource>
66-
</DelphiCompile>
67-
<DCCReference Include="fmMain.pas">
68-
<Form>TMain</Form>
69-
</DCCReference>
70-
<BuildConfiguration Include="Debug">
71-
<Key>Cfg_2</Key>
72-
<CfgParent>Base</CfgParent>
73-
</BuildConfiguration>
74-
<BuildConfiguration Include="Base">
75-
<Key>Base</Key>
76-
</BuildConfiguration>
77-
<BuildConfiguration Include="Release">
78-
<Key>Cfg_1</Key>
79-
<CfgParent>Base</CfgParent>
80-
</BuildConfiguration>
81-
</ItemGroup>
82-
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
83-
<ProjectExtensions>
84-
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
85-
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
86-
<BorlandProject>
87-
<Delphi.Personality>
88-
<Source>
89-
<Source Name="MainSource">VarPythUnitTest.dpr</Source>
90-
</Source>
91-
<Parameters>
92-
<Parameters Name="UseLauncher">False</Parameters>
93-
<Parameters Name="LoadAllSymbols">True</Parameters>
94-
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
95-
</Parameters>
96-
<VersionInfo>
97-
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
98-
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
99-
<VersionInfo Name="MajorVer">1</VersionInfo>
100-
<VersionInfo Name="MinorVer">0</VersionInfo>
101-
<VersionInfo Name="Release">0</VersionInfo>
102-
<VersionInfo Name="Build">0</VersionInfo>
103-
<VersionInfo Name="Debug">False</VersionInfo>
104-
<VersionInfo Name="PreRelease">False</VersionInfo>
105-
<VersionInfo Name="Special">False</VersionInfo>
106-
<VersionInfo Name="Private">False</VersionInfo>
107-
<VersionInfo Name="DLL">False</VersionInfo>
108-
<VersionInfo Name="Locale">1033</VersionInfo>
109-
<VersionInfo Name="CodePage">1252</VersionInfo>
110-
</VersionInfo>
111-
<VersionInfoKeys>
112-
<VersionInfoKeys Name="CompanyName"/>
113-
<VersionInfoKeys Name="FileDescription"/>
114-
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
115-
<VersionInfoKeys Name="InternalName"/>
116-
<VersionInfoKeys Name="LegalCopyright"/>
117-
<VersionInfoKeys Name="LegalTrademarks"/>
118-
<VersionInfoKeys Name="OriginalFilename"/>
119-
<VersionInfoKeys Name="ProductName"/>
120-
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
121-
<VersionInfoKeys Name="Comments"/>
122-
</VersionInfoKeys>
123-
<Excluded_Packages>
124-
<Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
125-
<Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
126-
</Excluded_Packages>
127-
</Delphi.Personality>
128-
<Platforms>
129-
<Platform value="Win64">True</Platform>
130-
<Platform value="Win32">True</Platform>
131-
</Platforms>
132-
</BorlandProject>
133-
<ProjectFileVersion>12</ProjectFileVersion>
134-
</ProjectExtensions>
135-
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
136-
</Project>
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<PropertyGroup>
3+
<ProjectGuid>{F6960501-E313-4232-96B9-EA62FB351D5E}</ProjectGuid>
4+
<MainSource>VarPythUnitTest.dpr</MainSource>
5+
<Config Condition="'$(Config)'==''">Debug</Config>
6+
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
7+
<ProjectVersion>19.1</ProjectVersion>
8+
<FrameworkType>VCL</FrameworkType>
9+
<Base>True</Base>
10+
<Platform Condition="'$(Platform)'==''">Win64</Platform>
11+
<TargetedPlatforms>3</TargetedPlatforms>
12+
<AppType>Application</AppType>
13+
</PropertyGroup>
14+
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
15+
<Base>true</Base>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Base)'=='true') or '$(Base_Win32)'!=''">
18+
<Base_Win32>true</Base_Win32>
19+
<CfgParent>Base</CfgParent>
20+
<Base>true</Base>
21+
</PropertyGroup>
22+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Base)'=='true') or '$(Base_Win64)'!=''">
23+
<Base_Win64>true</Base_Win64>
24+
<CfgParent>Base</CfgParent>
25+
<Base>true</Base>
26+
</PropertyGroup>
27+
<PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
28+
<Cfg_1>true</Cfg_1>
29+
<CfgParent>Base</CfgParent>
30+
<Base>true</Base>
31+
</PropertyGroup>
32+
<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
33+
<Cfg_2>true</Cfg_2>
34+
<CfgParent>Base</CfgParent>
35+
<Base>true</Base>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
38+
<Cfg_2_Win32>true</Cfg_2_Win32>
39+
<CfgParent>Cfg_2</CfgParent>
40+
<Cfg_2>true</Cfg_2>
41+
<Base>true</Base>
42+
</PropertyGroup>
43+
<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
44+
<Cfg_2_Win64>true</Cfg_2_Win64>
45+
<CfgParent>Cfg_2</CfgParent>
46+
<Cfg_2>true</Cfg_2>
47+
<Base>true</Base>
48+
</PropertyGroup>
49+
<PropertyGroup Condition="'$(Base)'!=''">
50+
<DCC_Namespace>Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;Winapi;System.Win;$(DCC_Namespace)</DCC_Namespace>
51+
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
52+
<VerInfo_Locale>1033</VerInfo_Locale>
53+
<DCC_DependencyCheckOutputName>VarPythUnitTest.exe</DCC_DependencyCheckOutputName>
54+
<DCC_ImageBase>00400000</DCC_ImageBase>
55+
<DCC_Platform>x86</DCC_Platform>
56+
<SanitizedProjectName>VarPythUnitTest</SanitizedProjectName>
57+
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Base_Win32)'!=''">
59+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
60+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
61+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
62+
<Manifest_File>(None)</Manifest_File>
63+
</PropertyGroup>
64+
<PropertyGroup Condition="'$(Base_Win64)'!=''">
65+
<DCC_Namespace>Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
66+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
67+
<Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
68+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
69+
<UWP_DelphiLogo44>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_44.png</UWP_DelphiLogo44>
70+
<UWP_DelphiLogo150>$(BDS)\bin\Artwork\Windows\UWP\delphi_UwpDefault_150.png</UWP_DelphiLogo150>
71+
<Icon_MainIcon>$(BDS)\bin\delphi_PROJECTICON.ico</Icon_MainIcon>
72+
</PropertyGroup>
73+
<PropertyGroup Condition="'$(Cfg_1)'!=''">
74+
<DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
75+
<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
76+
<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
77+
<DCC_DebugInformation>0</DCC_DebugInformation>
78+
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Cfg_2)'!=''">
80+
<DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
81+
</PropertyGroup>
82+
<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
83+
<Manifest_File>None</Manifest_File>
84+
<BT_BuildType>Debug</BT_BuildType>
85+
</PropertyGroup>
86+
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
87+
<BT_BuildType>Debug</BT_BuildType>
88+
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
89+
<AppEnableRuntimeThemes>true</AppEnableRuntimeThemes>
90+
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
91+
</PropertyGroup>
92+
<ItemGroup>
93+
<DelphiCompile Include="$(MainSource)">
94+
<MainSource>MainSource</MainSource>
95+
</DelphiCompile>
96+
<DCCReference Include="fmMain.pas">
97+
<Form>TMain</Form>
98+
</DCCReference>
99+
<BuildConfiguration Include="Debug">
100+
<Key>Cfg_2</Key>
101+
<CfgParent>Base</CfgParent>
102+
</BuildConfiguration>
103+
<BuildConfiguration Include="Base">
104+
<Key>Base</Key>
105+
</BuildConfiguration>
106+
<BuildConfiguration Include="Release">
107+
<Key>Cfg_1</Key>
108+
<CfgParent>Base</CfgParent>
109+
</BuildConfiguration>
110+
</ItemGroup>
111+
<Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
112+
<ProjectExtensions>
113+
<Borland.Personality>Delphi.Personality.12</Borland.Personality>
114+
<Borland.ProjectType>VCLApplication</Borland.ProjectType>
115+
<BorlandProject>
116+
<Delphi.Personality>
117+
<Source>
118+
<Source Name="MainSource">VarPythUnitTest.dpr</Source>
119+
</Source>
120+
<Parameters>
121+
<Parameters Name="UseLauncher">False</Parameters>
122+
<Parameters Name="LoadAllSymbols">True</Parameters>
123+
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
124+
</Parameters>
125+
<VersionInfo>
126+
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
127+
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
128+
<VersionInfo Name="MajorVer">1</VersionInfo>
129+
<VersionInfo Name="MinorVer">0</VersionInfo>
130+
<VersionInfo Name="Release">0</VersionInfo>
131+
<VersionInfo Name="Build">0</VersionInfo>
132+
<VersionInfo Name="Debug">False</VersionInfo>
133+
<VersionInfo Name="PreRelease">False</VersionInfo>
134+
<VersionInfo Name="Special">False</VersionInfo>
135+
<VersionInfo Name="Private">False</VersionInfo>
136+
<VersionInfo Name="DLL">False</VersionInfo>
137+
<VersionInfo Name="Locale">1033</VersionInfo>
138+
<VersionInfo Name="CodePage">1252</VersionInfo>
139+
</VersionInfo>
140+
<VersionInfoKeys>
141+
<VersionInfoKeys Name="CompanyName"/>
142+
<VersionInfoKeys Name="FileDescription"/>
143+
<VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
144+
<VersionInfoKeys Name="InternalName"/>
145+
<VersionInfoKeys Name="LegalCopyright"/>
146+
<VersionInfoKeys Name="LegalTrademarks"/>
147+
<VersionInfoKeys Name="OriginalFilename"/>
148+
<VersionInfoKeys Name="ProductName"/>
149+
<VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
150+
<VersionInfoKeys Name="Comments"/>
151+
</VersionInfoKeys>
152+
<Excluded_Packages/>
153+
</Delphi.Personality>
154+
<Platforms>
155+
<Platform value="Win32">True</Platform>
156+
<Platform value="Win64">True</Platform>
157+
</Platforms>
158+
</BorlandProject>
159+
<ProjectFileVersion>12</ProjectFileVersion>
160+
</ProjectExtensions>
161+
<Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
162+
</Project>

‎Demos/Demo25/VarPythUnitTest.res

108 KB
Binary file not shown.

0 commit comments

Comments
 (0)