[Csp-commits] svn:csp r1467 - in trunk/CSP/CSPSim/Tools/Layout: . VisualStudio2003 VisualStudio2003/Layout

[<sv...@ww...>]

Author: delta
Date: 2005-02-07 09:41:25 -0800 (Mon, 07 Feb 2005)
New Revision: 1467

Modified:
   trunk/CSP/CSPSim/Tools/Layout/Loader.cpp
   trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/Layout/Layout.vcproj
   trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/VisualStudio.sln
Log:
* Small correction to the project file.
* Added #include <Animation.h> to Loader.cpp to make it compile on vs. Loader doesn't link properly yet.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1467

Modified: trunk/CSP/CSPSim/Tools/Layout/Loader.cpp
===================================================================
--- trunk/CSP/CSPSim/Tools/Layout/Loader.cpp	2005-02-07 03:27:53 UTC (rev 1466)
+++ trunk/CSP/CSPSim/Tools/Layout/Loader.cpp	2005-02-07 17:41:25 UTC (rev 1467)
@@ -26,6 +26,7 @@
 #include <Theater/FeatureSceneGroup.h>
 #include <Theater/ElevationCorrection.h>
 #include <Theater/LayoutTransform.h>
+#include <Animation.h>
 #include <ObjectModel.h>
 
 #include <osgDB/ReadFile>

Modified: trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/Layout/Layout.vcproj
===================================================================
--- trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/Layout/Layout.vcproj	2005-02-07 03:27:53 UTC (rev 1466)
+++ trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/Layout/Layout.vcproj	2005-02-07 17:41:25 UTC (rev 1467)
@@ -28,7 +28,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="osgd.lib OpenThreadsWin32d.lib osgGAd.lib osgProducerd.lib osgDBd.lib Producerd.lib osgUtild.lib"
-				OutputFile="../../.bin/$(ProjectName)d.dll"
+				OutputFile="../../_c$(ProjectName)d.dll"
 				AdditionalLibraryDirectories="$(PYTHON_PATH)/libs"
 				OptimizeReferences="2"
 				ImportLibrary="$(OutDir)/$(TargetName).lib"/>
@@ -70,7 +70,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="osg.lib OpenThreadsWin32.lib osgGA.lib osgProducer.lib osgDB.lib Producer.lib osgUtil.lib"
-				OutputFile="../../.bin/$(ProjectName).dll"
+				OutputFile="../../_c$(ProjectName).dll"
 				AdditionalLibraryDirectories="$(PYTHON_PATH)/libs"/>
 			<Tool
 				Name="VCMIDLTool"/>
@@ -168,7 +168,8 @@
 				Name="Release|Win32">
 				<Tool
 					Name="VCCustomBuildTool"
-					CommandLine="$(SWIG_PATH)\swig -runtime -c++ -python -noexcept -I..\..\..\SimData\Include -I..\..\.. -o ..\..\$(InputName)_wrap.cpp ..\..\$(InputName).i"
+					CommandLine="$(SWIG_PATH)\swig -runtime -c++ -python -noexcept -I..\..\..\SimData\Include -I..\..\.. -o ..\..\$(InputName)_wrap.cpp ..\..\$(InputName).i
+"
 					Outputs="..\..\$(InputName)_wrap.cpp"/>
 			</FileConfiguration>
 		</File>

Modified: trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/VisualStudio.sln
===================================================================
--- trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/VisualStudio.sln	2005-02-07 03:27:53 UTC (rev 1466)
+++ trunk/CSP/CSPSim/Tools/Layout/VisualStudio2003/VisualStudio.sln	2005-02-07 17:41:25 UTC (rev 1467)
@@ -3,6 +3,10 @@
 	ProjectSection(ProjectDependencies) = postProject
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Loader", "Loader\Loader.vcproj", "{8E5E75D5-0A46-40EB-AB25-676CA88EE05C}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -13,6 +17,10 @@
 		{93A0D0F8-4393-42B1-9BB6-B8DB08952FB7}.Debug.Build.0 = Debug|Win32
 		{93A0D0F8-4393-42B1-9BB6-B8DB08952FB7}.Release.ActiveCfg = Release|Win32
 		{93A0D0F8-4393-42B1-9BB6-B8DB08952FB7}.Release.Build.0 = Release|Win32
+		{8E5E75D5-0A46-40EB-AB25-676CA88EE05C}.Debug.ActiveCfg = Debug|Win32
+		{8E5E75D5-0A46-40EB-AB25-676CA88EE05C}.Debug.Build.0 = Debug|Win32
+		{8E5E75D5-0A46-40EB-AB25-676CA88EE05C}.Release.ActiveCfg = Release|Win32
+		{8E5E75D5-0A46-40EB-AB25-676CA88EE05C}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection