[GME-commit] GMESRC/Tools/GMEMerge GMEMergeComponent.vcproj,1.2,1.3

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/Tools/GMEMerge
In directory escher:/tmp/cvs-serv25653/Tools/GMEMerge

Modified Files:
	GMEMergeComponent.vcproj 
Log Message:
Test release for GME merge

CVS User: Peter Volgyesi, ISIS (volgy)

Index: GMEMergeComponent.vcproj
===================================================================
RCS file: /project/gme-repository/GMESRC/Tools/GMEMerge/GMEMergeComponent.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GMEMergeComponent.vcproj	15 Aug 2006 19:52:10 -0000	1.2
--- GMEMergeComponent.vcproj	15 Aug 2006 22:44:19 -0000	1.3
***************
*** 24,28 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="../../gme/common;./"
  				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
  				BasicRuntimeChecks="3"
--- 24,28 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="../../GME/Common;./;../../SDK/BON"
  				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL"
  				BasicRuntimeChecks="3"
***************
*** 37,45 ****
  				WarningLevel="3"
  				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="4"/>
  			<Tool
  				Name="VCCustomBuildTool"
  				Description="Performing registration"
! 				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
  echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
  "
--- 37,45 ----
  				WarningLevel="3"
  				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="3"/>
  			<Tool
  				Name="VCCustomBuildTool"
  				Description="Performing registration"
! 				CommandLine="regsvr32 /s $(TargetPath)&quot;
  echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
  "
***************
*** 107,115 ****
  				ProgramDataBaseFileName=".\Release/"
  				WarningLevel="3"
! 				SuppressStartupBanner="TRUE"/>
  			<Tool
  				Name="VCCustomBuildTool"
  				Description="Performing registration"
! 				CommandLine="regsvr32 /s /c &quot;$(TargetPath)&quot;
  echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
  "
--- 107,116 ----
  				ProgramDataBaseFileName=".\Release/"
  				WarningLevel="3"
! 				SuppressStartupBanner="TRUE"
! 				DebugInformationFormat="3"/>
  			<Tool
  				Name="VCCustomBuildTool"
  				Description="Performing registration"
! 				CommandLine="regsvr32 /s $(TargetPath)&quot;
  echo regsvr32 exec. time &gt; &quot;$(OutDir)\regsvr32.trg&quot;
  "
***************
*** 121,124 ****
--- 122,126 ----
  				SuppressStartupBanner="TRUE"
  				ModuleDefinitionFile=".\Component.def"
+ 				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Release/GMEMergeComponent.pdb"
  				SubSystem="2"
***************
*** 245,248 ****
--- 247,253 ----
  			Filter="h;hpp;hxx;hm;inl">
  			<File
+ 				RelativePath="..\..\SDK\BON\ComHelp.h">
+ 			</File>
+ 			<File
  				RelativePath="..\..\Gme\Common\CommonCollection.h">
  			</File>
***************
*** 267,270 ****
--- 272,284 ----
  			<File
  				RelativePath="ComponentConfig.h">
+ 			</File>
+ 			<File
+ 				RelativePath="..\..\SDK\BON\ComponentDll.h">
+ 			</File>
+ 			<File
+ 				RelativePath="..\..\SDK\BON\ComponentObj.h">
+ 			</File>
+ 			<File
+ 				RelativePath="..\..\SDK\BON\GMECOM.h">
  			</File>
  			<File