[Csp-commits] THIRDPARTYLIBS/demeter DemeterVisualC6.vcproj,1.2,1.3 DemeterVisualC6.sln,1.1,1.2 DemeterVisualC6.dsp,1.1.1.1,1.2 CHANGES.current,1.6,1.7

[<de...@us...>]

Update of /cvsroot/csp/THIRDPARTYLIBS/demeter
In directory sc8-pr-cvs1:/tmp/cvs-serv13468

Modified Files:
	DemeterVisualC6.vcproj DemeterVisualC6.sln DemeterVisualC6.dsp 
	CHANGES.current 
Log Message:
see CHANGES.current

Index: DemeterVisualC6.vcproj
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DemeterVisualC6.vcproj	18 Apr 2003 11:26:17 -0000	1.2
--- DemeterVisualC6.vcproj	10 Jun 2003 22:48:37 -0000	1.3
***************
*** 41,45 ****
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib"
! 				OutputFile="Debug/DemeterVisualC6d.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
--- 41,45 ----
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib"
! 				OutputFile="../../APPLICATIONS/CSPSim/Bin/DemeterVisualC6d.dll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
***************
*** 48,52 ****
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Debug/DemeterVisualC6d.pdb"
! 				ImportLibrary=".\Debug/DemeterVisualC6d.lib"/>
  			<Tool
  				Name="VCMIDLTool"
--- 48,52 ----
  				GenerateDebugInformation="TRUE"
  				ProgramDatabaseFile=".\Debug/DemeterVisualC6d.pdb"
! 				ImportLibrary="../lib/DemeterVisualC6d.lib"/>
  			<Tool
  				Name="VCMIDLTool"
***************
*** 101,110 ****
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib"
! 				OutputFile=".\Release/DemeterVisualC6.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\lib"
  				ProgramDatabaseFile=".\Release/DemeterVisualC6.pdb"
! 				ImportLibrary=".\Release/DemeterVisualC6.lib"/>
  			<Tool
  				Name="VCMIDLTool"
--- 101,110 ----
  				AdditionalOptions="/MACHINE:I386"
  				AdditionalDependencies="osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib"
! 				OutputFile="../../APPLICATIONS/CSPSim/Bin/DemeterVisualC6.dll"
  				LinkIncremental="1"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\lib"
  				ProgramDatabaseFile=".\Release/DemeterVisualC6.pdb"
! 				ImportLibrary="../lib/DemeterVisualC6.lib"/>
  			<Tool
  				Name="VCMIDLTool"

Index: DemeterVisualC6.sln
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DemeterVisualC6.sln	6 Apr 2003 10:39:18 -0000	1.1
--- DemeterVisualC6.sln	10 Jun 2003 22:48:37 -0000	1.2
***************
*** 10,15 ****
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.ActiveCfg = Release|Win32
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.Build.0 = Release|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.ActiveCfg = Release|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.Build.0 = Release|Win32
--- 10,15 ----
  	EndGlobalSection
  	GlobalSection(ProjectConfiguration) = postSolution
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.ActiveCfg = Debug|Win32
! 		{3DB95589-1C58-48C4-A62B-10443581A35F}.Debug.Build.0 = Debug|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.ActiveCfg = Release|Win32
  		{3DB95589-1C58-48C4-A62B-10443581A35F}.Release.Build.0 = Release|Win32

Index: DemeterVisualC6.dsp
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/DemeterVisualC6.dsp,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** DemeterVisualC6.dsp	5 Dec 2002 03:33:40 -0000	1.1.1.1
--- DemeterVisualC6.dsp	10 Jun 2003 22:48:37 -0000	1.2
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /D "TERRAIN_EXPORTS" /D "_USE_GDAL_" /D "_PROTECT_ACCESS_" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /YX /FD /c
! # ADD CPP /nologo /MT /W3 /GR /GX /O2 /I "..\include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "DEMETERVISUALC6_EXPORTS" /D "TERRAIN_EXPORTS" /D "_STLP_USE_OWN_NAMESPACE" /FD /c
  # SUBTRACT CPP /YX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
***************
*** 55,59 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
! # ADD LINK32 gdal_i.lib osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib /nologo /dll /machine:I386 /libpath:"..\lib"
  
  !ELSEIF  "$(CFG)" == "DemeterVisualC6 - Win32 Debug"
--- 55,59 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
! # ADD LINK32 osg.lib opengl32.lib glu32.lib SDL.lib SDL_image.lib /nologo /dll /machine:I386 /libpath:"..\lib"
  
  !ELSEIF  "$(CFG)" == "DemeterVisualC6 - Win32 Debug"
***************
*** 82,86 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 SDL_imaged.lib SDLd.lib osgd.lib gdal_i.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Debug/DemeterVisualC6d.dll" /pdbtype:sept /libpath:"..\lib"
  
  !ENDIF 
--- 82,86 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 SDL_imaged.lib SDLd.lib osgd.lib opengl32.lib glu32.lib /nologo /dll /debug /machine:I386 /nodefaultlib:"libcmt.lib" /out:"Debug/DemeterVisualC6d.dll" /pdbtype:sept /libpath:"..\lib"
  
  !ENDIF 

Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/THIRDPARTYLIBS/demeter/CHANGES.current,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** CHANGES.current	10 Jun 2003 22:34:26 -0000	1.6
--- CHANGES.current	10 Jun 2003 22:48:37 -0000	1.7
***************
*** 6,11 ****
  	    its own thread.
  
  2003-04-18: delta
! 	    Checked Onsight changes. got ride of some vc++ warnings.
  	    Updated .NET project.
  
--- 6,16 ----
  	    its own thread.
  
+ 2003-05-15: delta
+ 	    Updated .net project such that dlls are now sent to 
+ 	    ../../APPLICATIONS/CSPSim/Bin and libs to ../lib.
+ 
  2003-04-18: delta
! 	    Checked Onsight changes. 
! 	    Got ride of some vc++ warnings.
  	    Updated .NET project.