Changeset 1747 for code/trunk/visual_studio/vc8

Timestamp:

Sep 9, 2008, 4:25:52 AM (16 years ago)

Author:

landauf

Message:

merged core3 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• visual_studio/vc8/core.vcproj (modified) (8 diffs)
• visual_studio/vc8/orxonox.vcproj (modified) (2 diffs)
• visual_studio/vc8/util.vcproj (modified) (4 diffs)

code/trunk/visual_studio/vc8/core.vcproj

@@ -161 +161 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Error.cc"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Language.cc"
                                 >
@@ -173 +169 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\OutputBuffer.cc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\OutputHandler.cc"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Script.cc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\SignalHandler.cc"
                                 >
                         </File>
@@ -253 +237 @@
                                         >
                                 </File>
+                                <File
+                                        RelativePath="..\..\src\core\ObjectListBase.cc"
+                                        >
+                                </File>
                         </Filter>
                         <Filter
@@ -365 +353 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\Debug.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\Error.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Language.h"
                                 >
@@ -381 +361 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\OutputBuffer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\core\OutputHandler.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\src\core\Script.h"
                                 >
@@ -397 +369 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\core\SignalHandler.h"
+                                RelativePath="..\..\src\core\Super.h"
                                 >
                         </File>
@@ -524 +496 @@
                                 </File>
                                 <File
+                                        RelativePath="..\..\src\core\IteratorBase.h"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\src\core\MetaObjectList.h"
                                         >
@@ -529 +505 @@
                                 <File
                                         RelativePath="..\..\src\core\ObjectList.h"
+                                        >
+                                </File>
+                                <File
+                                        RelativePath="..\..\src\core\ObjectListBase.h"
                                         >
                                 </File>

code/trunk/visual_studio/vc8/orxonox.vcproj

@@ -189 +189 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\orxonox\SignalHandler.cc"
+                                >
+                        </File>
+                        <Filter
+                                Name="hud"
+                        <File
                                 RelativePath="..\..\src\orxonox\RadarListener.cc"
                                 >
@@ -558 +564 @@
                         <File
                                 RelativePath="..\..\src\orxonox\Settings.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\orxonox\SignalHandler.h"
                                 >
                         </File>

code/trunk/visual_studio/vc8/util.vcproj

@@ -161 +161 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\Error.cc"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\ExprParser.cc"
                                 >
@@ -169 +173 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\util\MultiTypeMath.cc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\util\MultiTypePrimitive.cc"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\util\MultiTypeString.cc"
+                                RelativePath="..\..\src\util\MultiType.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\util\OutputBuffer.cc"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\util\OutputHandler.cc"
                                 >
                         </File>
@@ -211 +215 @@
                         </File>
                         <File
+                                RelativePath="..\..\src\util\Debug.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\util\Error.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\src\util\ExprParser.h"
                                 >
@@ -223 +235 @@
                         </File>
                         <File
-                                RelativePath="..\..\src\util\MultiTypeMath.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\util\MultiTypePrimitive.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\src\util\MultiTypeString.h"
+                                RelativePath="..\..\src\util\MultiTypeValue.h"
                                 >
                         </File>
                         <File
                                 RelativePath="..\..\src\util\OrxonoxPlatform.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\util\OutputBuffer.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\src\util\OutputHandler.h"
                                 >
                         </File>