Changeset 5695 for code/trunk/src/orxonox/tools/ResourceCollection.h

Timestamp:

Aug 30, 2009, 2:22:00 AM (16 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/tools/ResourceCollection.h (copied) (copied from code/branches/resource2/src/orxonox/tools/ResourceCollection.h) (2 diffs)

code/trunk/src/orxonox/tools/ResourceCollection.h

@@ -30 +30 @@
 #define _ResourceCollection_H__
 
-#include "OrxonoxPrereqs.h"
+#include "tools/ToolsPrereqs.h"
 
 #include <string>
@@ -40 +40 @@
     class ResourceLocation;
 
-    class _OrxonoxExport ResourceCollection : public BaseObject
+    class _ToolsExport ResourceCollection : public BaseObject
     {
     public: