Changeset 1961 for code/branches/objecthierarchy/visual_studio

Timestamp:

Oct 20, 2008, 12:04:03 AM (16 years ago)

Author:

rgrieder

Message:

updated msvc files and adjusted merged files.

Location:

code/branches/objecthierarchy/visual_studio/vc8

Files:

• core.vcproj (modified) (4 diffs)
• orxonox.vcproj (modified) (4 diffs)

code/branches/objecthierarchy/visual_studio/vc8/core.vcproj

@@ -173 +173 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\LuaBind.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\OrxonoxClass.cc"
                                 >
@@ -178 +182 @@
                         <File
                                 RelativePath="..\..\src\core\RootGameState.cc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\Script.cc"
                                 >
                         </File>
@@ -405 +405 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\core\LuaBind.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\core\OrxonoxClass.h"
                                 >
@@ -410 +414 @@
                         <File
                                 RelativePath="..\..\src\core\RootGameState.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\Script.h"
                                 >
                         </File>

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

@@ -200 +200 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\DistanceTrigger.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Radar.cc"
                                         >
@@ -212 +216 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\Script.cc"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Tickable.cc"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\Trigger.cc"
                                         >
                                 </File>
@@ -536 +548 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\DistanceTrigger.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Radar.h"
                                         >
@@ -548 +564 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\orxonox\objects\Script.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\orxonox\objects\Tickable.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\orxonox\objects\Trigger.h"
                                         >
                                 </File>