[Csp-commits] svn:csp r1346 - in trunk/CSP/SimData: . Config Include/SimData Source VisualStudio2003

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

Author: delta
Date: 2004-12-03 15:02:01 -0800 (Fri, 03 Dec 2004)
New Revision: 1346

Added:
   trunk/CSP/SimData/Config/
   trunk/CSP/SimData/Config/Config.sln
   trunk/CSP/SimData/Config/Config.vcproj
Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/Uniform.h
   trunk/CSP/SimData/Source/Config.cpp
   trunk/CSP/SimData/VisualStudio2003/SimData.sln
   trunk/CSP/SimData/VisualStudio2003/SimData.vcproj
Log:
* Updated SimData project files adding a simple project to build Config.cpp. Added a dependency from SimData onto Config and a custom pre-build step.
* Changed _WIN32 to more vc++ specific protection for SIMDATA_STATIC_CONST_DEF(x).

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

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/CHANGES.current	2004-12-03 23:02:01 UTC (rev 1346)
@@ -1,6 +1,14 @@
 Version 0.4.0 (in progress)
 ===========================
 
+2004-12-03: delta
+ * Updated SimData project files adding a simple project to build 
+   Config.cpp. Added a dependency from SimData onto Config and a
+   custom pre-build step.
+ 
+ * Changed _WIN32 to more vc++ specific protection for 
+   SIMDATA_STATIC_CONST_DEF(x).
+
 2004-12-02: onsight
  * Refactored the Reader and Writer classes, and their subclasses.  Most
    of the logic is now in non-virtual base class methods, with a virtual

Added: trunk/CSP/SimData/Config/Config.sln
===================================================================
--- trunk/CSP/SimData/Config/Config.sln	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/Config/Config.sln	2004-12-03 23:02:01 UTC (rev 1346)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Config", "Config.vcproj", "{33DAE914-B7A2-407A-993E-0A12C4A3544B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Debug.ActiveCfg = Debug|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Debug.Build.0 = Debug|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Release.ActiveCfg = Release|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

Added: trunk/CSP/SimData/Config/Config.vcproj
===================================================================
--- trunk/CSP/SimData/Config/Config.vcproj	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/Config/Config.vcproj	2004-12-03 23:02:01 UTC (rev 1346)
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="Config"
+	ProjectGUID="{33DAE914-B7A2-407A-993E-0A12C4A3544B}"
+	Keyword="MakeFileProj">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="5"
+				WarningLevel="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="../SimData/$(ProjectName)d.exe"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="2"
+				EnableIntrinsicFunctions="TRUE"
+				FavorSizeOrSpeed="1"
+				EnableFiberSafeOptimizations="TRUE"
+				OptimizeForProcessor="3"
+				OptimizeForWindowsApplication="TRUE"
+				WarningLevel="3"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile="../SimData/$(ProjectName).exe"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}">
+			<File
+				RelativePath="..\Source\Config.cpp">
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Modified: trunk/CSP/SimData/Include/SimData/Uniform.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/Uniform.h	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/Include/SimData/Uniform.h	2004-12-03 23:02:01 UTC (rev 1346)
@@ -65,7 +65,7 @@
 typedef unsigned int uint32;
 #endif
 
-#ifdef _WIN32
+#if defined(_MSC_VER) && (_MSC_VER >= 1310)
 # define SIMDATA_STATIC_CONST_DEF(x)
 # define SIMDATA_PACKED
 typedef __int64 int64;

Modified: trunk/CSP/SimData/Source/Config.cpp
===================================================================
--- trunk/CSP/SimData/Source/Config.cpp	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/Source/Config.cpp	2004-12-03 23:02:01 UTC (rev 1346)
@@ -24,6 +24,7 @@
  */
 
 #include <iostream>
+#include <string>
 
 int main(int, char **argv) {
 	int x = 1;

Modified: trunk/CSP/SimData/VisualStudio2003/SimData.sln
===================================================================
--- trunk/CSP/SimData/VisualStudio2003/SimData.sln	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/VisualStudio2003/SimData.sln	2004-12-03 23:02:01 UTC (rev 1346)
@@ -1,8 +1,13 @@
 Microsoft Visual Studio Solution File, Format Version 8.00
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimData", "SimData.vcproj", "{F9948756-70B5-4328-8A6A-F4BE5A521A27}"
 	ProjectSection(ProjectDependencies) = postProject
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B} = {33DAE914-B7A2-407A-993E-0A12C4A3544B}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Config", "..\Config\Config.vcproj", "{33DAE914-B7A2-407A-993E-0A12C4A3544B}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfiguration) = preSolution
 		Debug = Debug
@@ -13,6 +18,10 @@
 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Debug.Build.0 = Debug|Win32
 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.ActiveCfg = Release|Win32
 		{F9948756-70B5-4328-8A6A-F4BE5A521A27}.Release.Build.0 = Release|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Debug.ActiveCfg = Debug|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Debug.Build.0 = Debug|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Release.ActiveCfg = Release|Win32
+		{33DAE914-B7A2-407A-993E-0A12C4A3544B}.Release.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 	EndGlobalSection

Modified: trunk/CSP/SimData/VisualStudio2003/SimData.vcproj
===================================================================
--- trunk/CSP/SimData/VisualStudio2003/SimData.vcproj	2004-12-03 22:37:20 UTC (rev 1345)
+++ trunk/CSP/SimData/VisualStudio2003/SimData.vcproj	2004-12-03 23:02:01 UTC (rev 1346)
@@ -78,7 +78,8 @@
 				CommandLine="copy /Y ..\Source\cSimData.py ..\SimData"
 				ExcludedFromBuild="FALSE"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="..\SimData\Config.exe &gt; ..\Include\SimData\Config.h"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool
@@ -148,7 +149,8 @@
 				CommandLine="copy /Y ..\Source\cSimData.py ..\SimData"
 				ExcludedFromBuild="FALSE"/>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+				CommandLine="..\SimData\Configd.exe &gt; ..\Include\SimData\Config.h"/>
 			<Tool
 				Name="VCPreLinkEventTool"/>
 			<Tool