From f618df9947ab391f1965b8514d0b77e46108453a Mon Sep 17 00:00:00 2001
From: rjongbloed <rjongbloed>
Date: Mon, 4 Jun 2007 12:37:23 +0000
Subject: [PATCH] Utilise new MergeSym feature to no longer overwrite the
 source .DEF file when building DLLs. This makes CVS updates much, MUCH faster
 at the expense of slightly slower (ten seconds or so) builds of the DLLs and
 a manual process for the maintainers (me) to update the CVS periodically.

---
 src/win32/opal_dll.vcproj | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/win32/opal_dll.vcproj b/src/win32/opal_dll.vcproj
index 718df334..41f9e9c4 100644
--- a/src/win32/opal_dll.vcproj
+++ b/src/win32/opal_dll.vcproj
@@ -291,9 +291,7 @@
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Merging exported library symbols"
-					CommandLine="MergeSym -I &quot;$(INCLUDE)&quot; -x ptlib\msos\ptlib_2003.dtf -x &quot;$(InputDir)\Private.def&quot; &quot;$(OutDir)\opals.lib&quot; &quot;$(InputPath)&quot;
-copy &quot;$(InputPath)&quot;+nul &quot;$(IntDir)\$(TargetName).def&quot;  &gt; nul
-"
+					CommandLine="MergeSym -I &quot;$(LIB)&quot; -x release\ptlib.def -x &quot;$(InputDir)\Private.def&quot; &quot;$(OutDir)\opals.lib&quot; &quot;$(InputPath)&quot; &quot;$(IntDir)\$(TargetName).def&quot;"
 					AdditionalDependencies="$(OutDir)\opals.lib;$(InputDir)Private.def;"
 					Outputs="$(IntDir)\$(TargetName).def"/>
 			</FileConfiguration>
@@ -332,9 +330,7 @@ copy &quot;$(InputPath)&quot;+nul &quot;$(IntDir)\$(TargetName).def&quot;  &gt;
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Merging exported library symbols"
-					CommandLine="MergeSym -I &quot;$(INCLUDE)&quot; -x ptlib\msos\ptlibd_2003.dtf -x &quot;$(InputDir)\Private.def&quot; &quot;$(OutDir)\opalsd.lib&quot; &quot;$(InputPath)&quot;
-copy &quot;$(InputPath)&quot;+nul &quot;$(IntDir)\$(TargetName).def&quot;  &gt; nul
-"
+					CommandLine="MergeSym -I &quot;$(LIB)&quot; -x debug\ptlibd.def -x &quot;$(InputDir)\Private.def&quot; &quot;$(OutDir)\opalsd.lib&quot; &quot;$(InputPath)&quot; &quot;$(IntDir)\$(TargetName).def&quot;"
 					AdditionalDependencies="$(OutDir)\opalsd.lib;$(InputDir)Private.def;"
 					Outputs="$(IntDir)\$(TargetName).def"/>
 			</FileConfiguration>
@@ -373,9 +369,7 @@ copy &quot;$(InputPath)&quot;+nul &quot;$(IntDir)\$(TargetName).def&quot;  &gt;
 				<Tool
 					Name="VCCustomBuildTool"
 					Description="Merging exported library symbols"
-					CommandLine="MergeSym -I &quot;$(INCLUDE)&quot; -x ptlib\msos\ptlib_2003.dtf -x &quot;$(InputDir)\Private.def&quot; &quot;$(OutDir)\opalsn.lib&quot; &quot;$(InputPath)&quot;
-copy &quot;$(InputPath)&quot;+nul &quot;$(IntDir)\$(TargetName).def&quot;  &gt; nul
-"
+					CommandLine="MergeSym -I &quot;$(LIB)&quot; -x release\ptlib.def -x &quot;$(InputDir)\Private.def&quot; &quot;$(OutDir)\opalsn.lib&quot; &quot;$(InputPath)&quot; &quot;$(IntDir)\$(TargetName).def&quot;"
 					AdditionalDependencies="$(OutDir)\opalsn.lib;$(InputDir)Private.def;"
 					Outputs="$(IntDir)\$(TargetName).def"/>
 			</FileConfiguration>
-- 
2.11.4.GIT