From ec2536d09a76ebe4543ac9cfe5a9106f4ad2b17b Mon Sep 17 00:00:00 2001
From: Mark van Renswoude <mark@x2software.net>
Date: Sun, 16 Mar 2014 08:47:27 +0000
Subject: [PATCH] Fixed: correct suffix for DXE2 package

---
 Packages/DXE2/X2Utils.dpk   | 2 +-
 Packages/DXE2/X2Utils.dproj | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Packages/DXE2/X2Utils.dpk b/Packages/DXE2/X2Utils.dpk
index a9731ab..e3806f5 100644
--- a/Packages/DXE2/X2Utils.dpk
+++ b/Packages/DXE2/X2Utils.dpk
@@ -25,7 +25,7 @@ package X2Utils;
 {$IMAGEBASE $400000}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'X2Utils'}
-{$LIBSUFFIX 'XE2'}
+{$LIBSUFFIX 'DXE2'}
 {$RUNONLY}
 {$IMPLICITBUILD ON}
 
diff --git a/Packages/DXE2/X2Utils.dproj b/Packages/DXE2/X2Utils.dproj
index b100617..9d6898f 100644
--- a/Packages/DXE2/X2Utils.dproj
+++ b/Packages/DXE2/X2Utils.dproj
@@ -113,6 +113,7 @@
 			<DCC_HppOutput>$(DELPHILIB)</DCC_HppOutput>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
+			<DllSuffix>DXE2</DllSuffix>
 			<VerInfo_Locale>1033</VerInfo_Locale>
 		</PropertyGroup>
 		<PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
@@ -159,10 +160,7 @@
 					<Source>
 						<Source Name="MainSource">X2Utils.dpk</Source>
 					</Source>
-					<Excluded_Packages>
-						<Excluded_Packages Name="$(BDSBIN)\dcloffice2k160.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
-						<Excluded_Packages Name="$(BDSBIN)\dclofficexp160.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
-					</Excluded_Packages>
+					<Excluded_Packages/>
 				</Delphi.Personality>
 				<Platforms>
 					<Platform value="Win64">True</Platform>