Changeset 1265 for code/branches/merge/visual_studio

Timestamp:

May 13, 2008, 5:40:42 PM (17 years ago)

Author:

rgrieder

Message:

• filled initialiser list of SpaceShip
• adapted VS files in order to link network statically (circular depend.)

Location:

code/branches/merge/visual_studio

Files:

• network_properties.vsprops (modified) (1 diff)
• orxonox_properties.vsprops (modified) (2 diffs)
• vc8/network.vcproj (modified) (4 diffs)
• vc8/orxonox.vcproj (modified) (2 diffs)

code/branches/merge/visual_studio/network_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="NETWORK_SHARED_BUILD;WIN32_LEAN_AND_MEAN"
+                PreprocessorDefinitions="NETWORK_STATIC_BUILD;WIN32_LEAN_AND_MEAN"
         />
         <Tool

code/branches/merge/visual_studio/orxonox_properties.vsprops

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                PreprocessorDefinitions="ORXONOX_SHARED_BUILD"
+                PreprocessorDefinitions="ORXONOX_SHARED_BUILD;NETWORK_STATIC_BUILD"
                 UsePrecompiledHeader="2"
                 PrecompiledHeaderThrough="OrxonoxStableHeaders.h"
@@ -14 +14 @@
         <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib"
+                AdditionalDependencies="OgreMain$(CSS).lib tcl85t.lib enet$(CS).lib zlib$(CS).lib"
                 OutputFile="$(OutDir)$(ProjectName)$(CS).exe"
-                IgnoreDefaultLibraryNames=""
+                IgnoreDefaultLibraryNames="LIBCMT;LIBCMTD"
         />
 </VisualStudioPropertySheet>

code/branches/merge/visual_studio/vc8/network.vcproj

@@ -18 +18 @@
                 <Configuration
                         Name="Debug|Win32"
-                        ConfigurationType="2"
+                        ConfigurationType="4"
                         InheritedPropertySheets="$(SolutionDir)base_properties_debug.vsprops;..\network_properties.vsprops"
                         CharacterSet="1"
@@ -50 +50 @@
                         />
                         <Tool
-                                Name="VCLinkerTool"
+                                Name="VCLibrarianTool"
                         />
                         <Tool
@@ -56 +56 @@
                         />
                         <Tool
-                                Name="VCManifestTool"
-                        />
-                        <Tool
                                 Name="VCXDCMakeTool"
                         />
@@ -66 +63 @@
                         <Tool
                                 Name="VCFxCopTool"
-                        />
-                        <Tool
-                                Name="VCAppVerifierTool"
-                        />
-                        <Tool
-                                Name="VCWebDeploymentTool"
                         />
                         <Tool

code/branches/merge/visual_studio/vc8/orxonox.vcproj

@@ -204 +204 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\CameraHandler.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Explosion.cc"
                                         >
@@ -459 +463 @@
                                 <File
                                         RelativePath="..\..\src\orxonox\objects\Camera.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\CameraHandler.h"
                                         >
                                 </File>