Changeset 917 for code/branches/network/visual_studio/vc8/orxonox.vcproj

Timestamp:

Mar 21, 2008, 6:14:31 PM (17 years ago)

Author:

rgrieder

Message:

• merged all changes in the input branch into this one
• moved Tickable to core (would have created circular library dependencies)
• exported OrxListener to a separate file, soon to be deleted

changed

, &&, XOR back to or, and, xor because I found the necessary include file for VC++

• created abortRequest() in Orxonox.cc to call for a smooth end of the game (an alternative would be to make tick() return a boolean, like it is with frameStarted())

File:

• code/branches/network/visual_studio/vc8/orxonox.vcproj (modified) (4 diffs)

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

@@ -287 +287 @@
                                 RelativePath="..\..\src\orxonox\InputManager.cc"
                                 >
+                                <FileConfiguration
+                                        Name="Debug|Win32"
+                                        ExcludedFromBuild="true"
+                                        >
+                                        <Tool
+                                                Name="VCCLCompilerTool"
+                                        />
+                                </FileConfiguration>
                         </File>
                         <File
@@ -627 +635 @@
                                         >
                                 </File>
-                        </Filter>
-                        <Filter
-                                Name="loader"
-                                >
-                                <File
-                                        RelativePath="..\..\src\loader\LevelLoader.cc"
+                                <File
+                                        RelativePath="..\..\src\orxonox\tools\OrxListener.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\tools\Timer.cc"
                                         >
                                 </File>
@@ -738 +746 @@
                                 </File>
                                 <File
-                                        RelativePath="..\..\src\orxonox\objects\Tickable.h"
-                                        >
-                                </File>
-                                <File
                                         RelativePath="..\..\src\orxonox\objects\WorldEntity.h"
                                         >
@@ -798 +802 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\tools\OrxListener.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\tools\Timer.h"
-                                        >
-                                </File>
-                        </Filter>
-                        <Filter
-                                Name="loader"
-                                >
-                                <File
-                                        RelativePath="..\..\src\loader\LevelLoader.h"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\src\loader\LoaderPrereqs.h"
                                         >
                                 </File>