[Csp-commits] svn:csp r948 - in trunk/CSP/CSPSim: . VisualStudio/CSPSimDLL

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

Author: wolverine
Date: 2004-05-08 07:37:10 -0700 (Sat, 08 May 2004)
New Revision: 948

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
Log:
change log update

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2004-05-08 14:34:55 UTC (rev 947)
+++ trunk/CSP/CSPSim/CHANGES.current	2004-05-08 14:37:10 UTC (rev 948)
@@ -2,7 +2,8 @@
 ===========================
 
 2004-05-08: Wolverine
-  * more updates to networking.
+  * more updates to networking. Including changes so both windows and unix
+    can compile.
 
 2004-05-02: wolverine
   * Updates to the networking to use commonc++, and export a python module.

Modified: trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj
===================================================================
--- trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj	2004-05-08 14:34:55 UTC (rev 947)
+++ trunk/CSP/CSPSim/VisualStudio/CSPSimDLL/CSPSimDLL.vcproj	2004-05-08 14:37:10 UTC (rev 948)
@@ -44,7 +44,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="ws2_32.lib OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib"
+				AdditionalDependencies="ws2_32.lib OpenThreadsWin32d.lib osgChunkLodd.lib osgFXd.lib sigc-1.2d.lib producerd.lib opengl32.lib SDL.lib osgDBd.lib DemeterVisualC6d.lib osgTextd.lib osgUtild.lib osgParticled.lib osgd.lib _cSimData.lib ccgnu2.lib ccext2.lib"
 				OutputFile="../../Bin/_cCSP.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
@@ -121,7 +121,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/MACHINE:I386"
-				AdditionalDependencies="ws2_32.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib"
+				AdditionalDependencies="ws2_32.lib osgFX.lib osgChunkLod.lib producer.lib osgText.lib DemeterVisualC6.lib opengl32.lib SDL.lib _cSimData.lib osgParticle.lib osgUtil.lib osgDB.lib osg.lib sigc-1.2.lib OpenThreadsWin32.lib  ccgnu2.lib ccext2.lib"
 				OutputFile="../../Bin/_cCSP.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="TRUE"
@@ -210,6 +210,9 @@
 				RelativePath="..\..\Source\ChunkLodTerrain.cpp">
 			</File>
 			<File
+				RelativePath="..\..\Source\ClientNode.cpp">
+			</File>
+			<File
 				RelativePath="..\..\Source\Collision.cpp">
 			</File>
 			<File
@@ -297,6 +300,9 @@
 				RelativePath="..\..\Source\ScreenInfoManager.cpp">
 			</File>
 			<File
+				RelativePath="..\..\Source\ServerNode.cpp">
+			</File>
+			<File
 				RelativePath="..\..\Source\SimObject.cpp">
 			</File>
 			<File
@@ -411,12 +417,25 @@
 				</File>
 				<File
 					RelativePath="..\..\Source\Views\View.cpp">
+					<FileConfiguration
+						Name="Debug|Win32">
+						<Tool
+							Name="VCCLCompilerTool"
+							GeneratePreprocessedFile="0"
+							ExpandAttributedSource="TRUE"/>
+					</FileConfiguration>
 				</File>
 			</Filter>
 			<Filter
 				Name="Networking"
 				Filter="">
 				<File
+					RelativePath="..\..\Source\Networking\MessageSocketDuplex.cpp">
+				</File>
+				<File
+					RelativePath="..\..\Source\Networking\NetworkAddress.cpp">
+				</File>
+				<File
 					RelativePath="..\..\Source\Networking\NetworkBroadcaster.cpp">
 				</File>
 				<File
@@ -473,6 +492,9 @@
 				RelativePath="..\..\Include\ChunkLodTerrain.h">
 			</File>
 			<File
+				RelativePath="..\..\Include\ClientNode.h">
+			</File>
+			<File
 				RelativePath="..\..\Include\Collision.h">
 			</File>
 			<File
@@ -578,6 +600,9 @@
 				RelativePath="..\..\Include\ScreenInfoManager.h">
 			</File>
 			<File
+				RelativePath="..\..\Include\ServerNode.h">
+			</File>
+			<File
 				RelativePath="..\..\Include\SimObject.h">
 			</File>
 			<File