[Sphere-axis-commits] CVS: Axis/S_Sphere52 S_Sphere52.vcproj,1.8,1.9 ScriptsMain.cpp,1.15,1.16

[Philip E. <pes...@us...>]

Update of /cvsroot/sphere-axis/Axis/S_Sphere52
In directory sc8-pr-cvs1:/tmp/cvs-serv14407/S_Sphere52

Modified Files:
	S_Sphere52.vcproj ScriptsMain.cpp 
Log Message:
no message

Index: S_Sphere52.vcproj
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/S_Sphere52.vcproj,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** S_Sphere52.vcproj	18 Jun 2003 22:45:25 -0000	1.8
--- S_Sphere52.vcproj	19 Jun 2003 05:59:58 -0000	1.9
***************
*** 17,21 ****
  			ConfigurationType="2"
  			UseOfMFC="2"
! 			UseOfATL="1"
  			ATLMinimizesCRunTimeLibraryUsage="FALSE"
  			CharacterSet="2">
--- 17,21 ----
  			ConfigurationType="2"
  			UseOfMFC="2"
! 			UseOfATL="2"
  			ATLMinimizesCRunTimeLibraryUsage="FALSE"
  			CharacterSet="2">
***************
*** 23,27 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="../S_ScriptsBase"
  				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB"
  				MinimalRebuild="TRUE"
--- 23,27 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="../../crypto51;../S_ScriptsBase"
  				PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_USRDLL;_MERGE_PROXYSTUB"
  				MinimalRebuild="TRUE"
***************
*** 37,46 ****
  			<Tool
  				Name="VCLinkerTool"
! 				IgnoreImportLibrary="TRUE"
! 				AdditionalDependencies="libxml2.lib comsvcs.lib ../S_ScriptsBase/Debug/S_ScriptsBase.lib"
  				ShowProgress="0"
  				OutputFile="$(OutDir)/S_Sphere52.dll"
  				LinkIncremental="2"
  				AdditionalLibraryDirectories=""
  				ModuleDefinitionFile=".\S_Sphere52.def"
  				GenerateDebugInformation="TRUE"
--- 37,48 ----
  			<Tool
  				Name="VCLinkerTool"
! 				RegisterOutput="FALSE"
! 				IgnoreImportLibrary="FALSE"
! 				AdditionalDependencies="libxml2.lib comsvcs.lib ..\S_ScriptsBase\Debug\S_ScriptsBase.lib"
  				ShowProgress="0"
  				OutputFile="$(OutDir)/S_Sphere52.dll"
  				LinkIncremental="2"
  				AdditionalLibraryDirectories=""
+ 				IgnoreAllDefaultLibraries="FALSE"
  				ModuleDefinitionFile=".\S_Sphere52.def"
  				GenerateDebugInformation="TRUE"
***************
*** 66,71 ****
  				Name="VCPreBuildEventTool"/>
  			<Tool
! 				Name="VCPreLinkEventTool"
! 				CommandLine="copy ..\S_ScriptsBase\Debug\*.dll debug"/>
  			<Tool
  				Name="VCResourceCompilerTool"
--- 68,72 ----
  				Name="VCPreBuildEventTool"/>
  			<Tool
! 				Name="VCPreLinkEventTool"/>
  			<Tool
  				Name="VCResourceCompilerTool"

Index: ScriptsMain.cpp
===================================================================
RCS file: /cvsroot/sphere-axis/Axis/S_Sphere52/ScriptsMain.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** ScriptsMain.cpp	18 Jun 2003 22:45:25 -0000	1.15
--- ScriptsMain.cpp	19 Jun 2003 05:59:58 -0000	1.16
***************
*** 2252,2256 ****
  			{
  				CString sFile;
! 				sFile.Format(_T("%s\\%s"), m_pProfile->ProfileName(), CMD5Hash::GetHash(csaScripts.GetAt(i)));
  				Main->m_pAxis->GetRemoteFile(csaScripts.GetAt(i), sFile);
  			}
--- 2252,2257 ----
  			{
  				CString sFile;
! 				CMD5Hash md5;
! 				sFile.Format(_T("%s\\%s"), m_pProfile->ProfileName(), md5.GetHash(csaScripts.GetAt(i)));
  				Main->m_pAxis->GetRemoteFile(csaScripts.GetAt(i), sFile);
  			}