From 12603632fa5e1cac92fca44d03518b7f2b39d2bf Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Sun, 16 Mar 2014 08:55:48 +0000
Subject: [PATCH] Added: Win64 compatibility

---
 Packages/DXE2/X2CLGL.dproj  |  53 +++++++++++++++++++++++++++++-----
 Packages/DXE2/X2CLGL.res    | Bin 1292 -> 1292 bytes
 Packages/DXE2/X2CLGLD.dproj |   2 +-
 Packages/DXE2/X2CLMB.dpk    |   1 -
 Packages/DXE2/X2CLMB.dproj  |  56 ++++++++++++++++++++++++++++++------
 Packages/DXE2/X2CLMB.res    | Bin 1292 -> 1292 bytes
 6 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/Packages/DXE2/X2CLGL.dproj b/Packages/DXE2/X2CLGL.dproj
index e73a5a2..a324256 100644
--- a/Packages/DXE2/X2CLGL.dproj
+++ b/Packages/DXE2/X2CLGL.dproj
@@ -10,7 +10,7 @@
 			<Base>True</Base>
 			<Config Condition="'$(Config)'==''">Debug</Config>
 			<Platform Condition="'$(Platform)'==''">Win32</Platform>
-			<TargetedPlatforms>1</TargetedPlatforms>
+			<TargetedPlatforms>3</TargetedPlatforms>
 			<AppType>Package</AppType>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -31,11 +31,35 @@
 			<CfgParent>Base</CfgParent>
 			<Base>true</Base>
 		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+			<Cfg_1_Win64>true</Cfg_1_Win64>
+			<CfgParent>Cfg_1</CfgParent>
+			<Cfg_1>true</Cfg_1>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+			<Cfg_1_Win32>true</Cfg_1_Win32>
+			<CfgParent>Cfg_1</CfgParent>
+			<Cfg_1>true</Cfg_1>
+			<Base>true</Base>
+		</PropertyGroup>
 		<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
 			<Cfg_2>true</Cfg_2>
 			<CfgParent>Base</CfgParent>
 			<Base>true</Base>
 		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+			<Cfg_2_Win64>true</Cfg_2_Win64>
+			<CfgParent>Cfg_2</CfgParent>
+			<Cfg_2>true</Cfg_2>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+			<Cfg_2_Win32>true</Cfg_2_Win32>
+			<CfgParent>Cfg_2</CfgParent>
+			<Cfg_2>true</Cfg_2>
+			<Base>true</Base>
+		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<DCC_RangeChecking>true</DCC_RangeChecking>
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
@@ -50,14 +74,20 @@
 			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win64)'!=''">
+			<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+			<DCC_BplOutput>$(DELPHIBIN64)</DCC_BplOutput>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+			<DCC_DcpOutput>$(DELPHIBIN64)</DCC_DcpOutput>
+			<DCC_DcuOutput>$(DELPHILIB64)</DCC_DcuOutput>
 			<Icon_MainIcon>X2CLGL_Icon.ico</Icon_MainIcon>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
+			<DCC_BplOutput>$(DELPHIBIN)</DCC_BplOutput>
+			<DCC_DcuOutput>$(DELPHILIB)</DCC_DcuOutput>
+			<DCC_DcpOutput>$(DELPHIBIN)</DCC_DcpOutput>
 			<Icon_MainIcon>X2CLGL_Icon.ico</Icon_MainIcon>
 			<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 			<VerInfo_Locale>1033</VerInfo_Locale>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1)'!=''">
 			<Version>7.0</Version>
@@ -68,15 +98,24 @@
 			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
 			<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
 		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2)'!=''">
 			<Version>7.0</Version>
 			<DCC_WriteableConstants>True</DCC_WriteableConstants>
 			<DCC_RangeChecking>True</DCC_RangeChecking>
-			<DCC_DcuOutput>$(DELPHILIB)</DCC_DcuOutput>
 			<DCC_ObjOutput>$(DELPHILIB)</DCC_ObjOutput>
 			<DCC_HppOutput>$(DELPHILIB)</DCC_HppOutput>
-			<DCC_BplOutput>$(DELPHIBIN)</DCC_BplOutput>
-			<DCC_DcpOutput>$(DELPHIBIN)</DCC_DcpOutput>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
 		</PropertyGroup>
 		<ProjectExtensions>
 			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -120,7 +159,7 @@
 					</Source>
 				</Delphi.Personality>
 				<Platforms>
-					<Platform value="Win64">False</Platform>
+					<Platform value="Win64">True</Platform>
 					<Platform value="Win32">True</Platform>
 				</Platforms>
 			</BorlandProject>
diff --git a/Packages/DXE2/X2CLGL.res b/Packages/DXE2/X2CLGL.res
index cfa92e4103c5ae0876d17bf0215b18bcb854072b..552855359360943e5f7b5fa426ab26ed0d1d41bf 100644
GIT binary patch
delta 12
TcmeC->fzeJ!OFtSz`y_i64C+j

delta 12
TcmeC->fzeJ!OFtOz`y_i63PMZ

diff --git a/Packages/DXE2/X2CLGLD.dproj b/Packages/DXE2/X2CLGLD.dproj
index 56dc4a6..7fcb6b1 100644
--- a/Packages/DXE2/X2CLGLD.dproj
+++ b/Packages/DXE2/X2CLGLD.dproj
@@ -56,7 +56,7 @@
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
 			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
 			<Icon_MainIcon>X2CLGLD_Icon.ico</Icon_MainIcon>
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
+			<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<VerInfo_Locale>1033</VerInfo_Locale>
 			<DCC_UsePackage>X2CLGL;$(DCC_UsePackage)</DCC_UsePackage>
 			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
diff --git a/Packages/DXE2/X2CLMB.dpk b/Packages/DXE2/X2CLMB.dpk
index ec94514..656c3bf 100644
--- a/Packages/DXE2/X2CLMB.dpk
+++ b/Packages/DXE2/X2CLMB.dpk
@@ -31,7 +31,6 @@ package X2CLMB;
 requires
   rtl,
   vcl,
-  designide,
   vclactnband,
   vclx;
 
diff --git a/Packages/DXE2/X2CLMB.dproj b/Packages/DXE2/X2CLMB.dproj
index 3b32793..45ad8fa 100644
--- a/Packages/DXE2/X2CLMB.dproj
+++ b/Packages/DXE2/X2CLMB.dproj
@@ -10,7 +10,7 @@
 			<Base>True</Base>
 			<Config Condition="'$(Config)'==''">Debug</Config>
 			<Platform Condition="'$(Platform)'==''">Win32</Platform>
-			<TargetedPlatforms>1</TargetedPlatforms>
+			<TargetedPlatforms>3</TargetedPlatforms>
 			<AppType>Package</AppType>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
@@ -31,11 +31,35 @@
 			<CfgParent>Base</CfgParent>
 			<Base>true</Base>
 		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win64)'!=''">
+			<Cfg_1_Win64>true</Cfg_1_Win64>
+			<CfgParent>Cfg_1</CfgParent>
+			<Cfg_1>true</Cfg_1>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_1)'=='true') or '$(Cfg_1_Win32)'!=''">
+			<Cfg_1_Win32>true</Cfg_1_Win32>
+			<CfgParent>Cfg_1</CfgParent>
+			<Cfg_1>true</Cfg_1>
+			<Base>true</Base>
+		</PropertyGroup>
 		<PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
 			<Cfg_2>true</Cfg_2>
 			<CfgParent>Base</CfgParent>
 			<Base>true</Base>
 		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win64' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win64)'!=''">
+			<Cfg_2_Win64>true</Cfg_2_Win64>
+			<CfgParent>Cfg_2</CfgParent>
+			<Cfg_2>true</Cfg_2>
+			<Base>true</Base>
+		</PropertyGroup>
+		<PropertyGroup Condition="('$(Platform)'=='Win32' and '$(Cfg_2)'=='true') or '$(Cfg_2_Win32)'!=''">
+			<Cfg_2_Win32>true</Cfg_2_Win32>
+			<CfgParent>Cfg_2</CfgParent>
+			<Cfg_2>true</Cfg_2>
+			<Base>true</Base>
+		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base)'!=''">
 			<RuntimeOnlyPackage>true</RuntimeOnlyPackage>
 			<DCC_OutputNeverBuildDcps>true</DCC_OutputNeverBuildDcps>
@@ -49,14 +73,20 @@
 			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win64)'!=''">
+			<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
+			<DCC_BplOutput>$(DELPHIBIN64)</DCC_BplOutput>
+			<VerInfo_Locale>1033</VerInfo_Locale>
+			<DCC_DcpOutput>$(DELPHIBIN64)</DCC_DcpOutput>
+			<DCC_DcuOutput>$(DELPHILIB64)</DCC_DcuOutput>
 			<Icon_MainIcon>X2CLMB_Icon.ico</Icon_MainIcon>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Base_Win32)'!=''">
+			<DCC_BplOutput>$(DELPHIBIN)</DCC_BplOutput>
+			<DCC_DcuOutput>$(DELPHILIB)</DCC_DcuOutput>
+			<DCC_DcpOutput>$(DELPHIBIN)</DCC_DcpOutput>
 			<Icon_MainIcon>X2CLMB_Icon.ico</Icon_MainIcon>
-			<DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
-			<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
+			<DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
 			<VerInfo_Locale>1033</VerInfo_Locale>
-			<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=</VerInfo_Keys>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_1)'!=''">
 			<Version>7.0</Version>
@@ -65,13 +95,22 @@
 			<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
 			<DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
 		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_1_Win32)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2)'!=''">
 			<Version>7.0</Version>
-			<DCC_DcuOutput>$(DELPHILIB)</DCC_DcuOutput>
 			<DCC_ObjOutput>$(DELPHILIB)</DCC_ObjOutput>
 			<DCC_HppOutput>$(DELPHILIB)</DCC_HppOutput>
-			<DCC_BplOutput>$(DELPHIBIN)</DCC_BplOutput>
-			<DCC_DcpOutput>$(DELPHIBIN)</DCC_DcpOutput>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
+		</PropertyGroup>
+		<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
+			<VerInfo_Locale>1033</VerInfo_Locale>
 		</PropertyGroup>
 		<ProjectExtensions>
 			<Borland.Personality>Delphi.Personality.12</Borland.Personality>
@@ -115,7 +154,7 @@
 					</Source>
 				</Delphi.Personality>
 				<Platforms>
-					<Platform value="Win64">False</Platform>
+					<Platform value="Win64">True</Platform>
 					<Platform value="Win32">True</Platform>
 				</Platforms>
 			</BorlandProject>
@@ -127,7 +166,6 @@
 			</DelphiCompile>
 			<DCCReference Include="rtl.dcp"/>
 			<DCCReference Include="vcl.dcp"/>
-			<DCCReference Include="designide.dcp"/>
 			<DCCReference Include="vclactnband.dcp"/>
 			<DCCReference Include="vclx.dcp"/>
 			<DCCReference Include="..\..\Source\X2CLunaMenuBarPainter.pas"/>
diff --git a/Packages/DXE2/X2CLMB.res b/Packages/DXE2/X2CLMB.res
index 7b1c222af649cea6250f8f03eaf3b6c87becf14c..bac28cf1cee1367206ae5ab7b8451409e0a59731 100644
GIT binary patch
delta 12
TcmeC->fzeJ!OFtSz`y_i64C+j

delta 12
TcmeC->fzeJ!OFtOz`y_i63PMZ