Changeset 682 for code/branches/FICN/src/orxonox/core

Timestamp:

Dec 25, 2007, 10:37:29 PM (17 years ago)

Author:

rgrieder

Message:

• adapted the core to be an actual windows dll (only tested with MSVC)
• misc header files dependency changes

Location:

code/branches/FICN/src/orxonox/core

Files:

• ArgReader.h (modified) (2 diffs)
• ClassFactory.h (modified) (1 diff)
• ConfigValueContainer.cc (modified) (1 diff)
• ConfigValueContainer.h (modified) (3 diffs)
• CoreIncludes.h (modified) (2 diffs)
• CorePrereqs.h (added)
• Debug.h (modified) (1 diff)
• DebugLevel.cc (modified) (1 diff)
• DebugLevel.h (modified) (2 diffs)
• Error.h (modified) (1 diff)
• Factory.cc (modified) (1 diff)
• Factory.h (modified) (4 diffs)
• Identifier.h (modified) (3 diffs)
• IdentifierList.h (modified) (3 diffs)
• Iterator.h (modified) (1 diff)
• MetaObjectList.h (modified) (2 diffs)
• ObjectList.h (modified) (2 diffs)
• OrxonoxClass.h (modified) (3 diffs)
• SignalHandler.cc (modified) (1 diff)
• SignalHandler.h (modified) (3 diffs)

code/branches/FICN/src/orxonox/core/ArgReader.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Benjamin Knecht <beni_at_orxonox.net>
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /**
  @file  Argreader.h
@@ -10 +37 @@
 #include <string>
 
+#include "CorePrereqs.h"
+
 namespace orxonox {
 
-  class ArgReader
+  class _CoreExport ArgReader
   {
     public:

code/branches/FICN/src/orxonox/core/ClassFactory.h

@@ -36 +36 @@
 #define _ClassFactory_H__
 
+#include <string>
+
+#include "CorePrereqs.h"
+
+#include "Factory.h"
 #include "Identifier.h"
 #include "Debug.h"

code/branches/FICN/src/orxonox/core/ConfigValueContainer.cc

@@ -27 +27 @@
 
 #include <fstream>
-#include "ConfigValueContainer.h"
+
 #include "../../misc/Tokenizer.h"
 #include "../../misc/String2Number.h"
+#include "ConfigValueContainer.h"
 
 #define CONFIGFILEPATH "orxonox.ini"

code/branches/FICN/src/orxonox/core/ConfigValueContainer.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
     @file ConfigValueContainer.h
@@ -18 +45 @@
 #include <string>
 #include <list>
+
+#include "CorePrereqs.h"
 
 #include "OgreVector2.h"
@@ -41 +70 @@
         If there is no section, the section and the entry are added to the end of the config-file.
     */
-    class ConfigValueContainer
+    class _CoreExport ConfigValueContainer
     {
         public:

code/branches/FICN/src/orxonox/core/CoreIncludes.h

@@ -26 +26 @@
  */
 
-#ifndef _CoreIncludes_H__
-#define _CoreIncludes_H__
-
 /**
     @file CoreIncludes.h
@@ -39 +36 @@
     the of the class implementation, so it gets executed before main().
 */
+
+#ifndef _CoreIncludes_H__
+#define _CoreIncludes_H__
+
+#include "CorePrereqs.h"
 
 // All needed header-files

code/branches/FICN/src/orxonox/core/Debug.h

@@ -37 +37 @@
 
 #include <stdio.h>
-
-int getSoftDebugLevel();
+#include <iostream>
+
+#include "CorePrereqs.h"
+
+extern "C" _CoreExport int getSoftDebugLevel();
 
 // DEFINE ERROR MODES

code/branches/FICN/src/orxonox/core/DebugLevel.cc

@@ -27 +27 @@
 
 #include "CoreIncludes.h"
+#include "Debug.h"
 #include "DebugLevel.h"
-#include "Debug.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/core/DebugLevel.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _DebugLevel_H__
 #define _DebugLevel_H__
+
+#include "CorePrereqs.h"
 
 #include "OrxonoxClass.h"
@@ -6 +35 @@
 namespace orxonox
 {
-    class DebugLevel : public OrxonoxClass
+    class _CoreExport DebugLevel : public OrxonoxClass
     {
         public:

code/branches/FICN/src/orxonox/core/Error.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 #ifndef _Error_H__
 #define _Error_H__
 
-#include <iostream>
 #include <string>
+
+#include "CorePrereqs.h"
 
 namespace orxonox
 {
-        class Error
+        class _CoreExport Error
         {
         public:

code/branches/FICN/src/orxonox/core/Factory.cc

@@ -31 +31 @@
 */
 
-#include "Factory.h"
 #include "Identifier.h"
 #include "Debug.h"
 #include "../objects/BaseObject.h"
+#include "Factory.h"
 
 namespace orxonox

code/branches/FICN/src/orxonox/core/Factory.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
     @file Factory.h
@@ -20 +47 @@
 #include <string>
 
+#include "CorePrereqs.h"
+
 namespace orxonox
 {
     class BaseObject; // Forward declaration
-    class Identifier; // Forward declaration
 
     // ###############################
@@ -29 +57 @@
     // ###############################
     //! The Factory is used to map the name or the network ID of a class with its Identifier.
-    class Factory
+    class _CoreExport Factory
     {
         public:
@@ -53 +81 @@
     // ###############################
     //! Base-class of ClassFactory. Has to be defined separate because of circular dependencies.
-    class BaseFactory
+    class _CoreExport BaseFactory
     {
         public:

code/branches/FICN/src/orxonox/core/Identifier.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
     @file Identifier.h
@@ -25 +52 @@
 #define _Identifier_H__
 
-#include <iostream>
+#include <string>
 #include <map>
 
+#include "CorePrereqs.h"
+
+#include "ObjectList.h"
 #include "IdentifierList.h"
-#include "ObjectList.h"
 #include "Factory.h"
-#include "ConfigValueContainer.h"
 #include "Debug.h"
+// These two files would actually be need, but they would produce
+// circular dependencies. Anyway, it does compile without them
+//#include "OrxonoxClass.h"
+//#include "MetaObjectList.h"
 
 namespace orxonox
@@ -56 +88 @@
         You can't directly create an Identifier, it's just the base-class for ClassIdentifier.
     */
-    class Identifier
+    class _CoreExport Identifier
     {
         template <class T>

code/branches/FICN/src/orxonox/core/IdentifierList.h

@@ -1 @@
-#ifndef _IdentifierList_H__
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
     @file IdentifierList.h
@@ -8 +34 @@
 */
 
+#ifndef _IdentifierList_H__
 #define _IdentifierList_H__
 
 #include <string>
 
+#include "CorePrereqs.h"
+
 namespace orxonox
 {
-    class Identifier; // Forward declaration
-
     //! The list-element of the IdentifierList
     class IdentifierListElement
@@ -27 +54 @@
 
     //! The IdentifierList contains Identifiers
-    class IdentifierList
+    class _CoreExport IdentifierList
     {
         public:

code/branches/FICN/src/orxonox/core/Iterator.h

@@ -46 +46 @@
 #define _Iterator_H__
 
+#include "CorePrereqs.h"
+
+#include "ObjectList.h"
 #include "Debug.h"
 

code/branches/FICN/src/orxonox/core/MetaObjectList.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
     @file MetaObjectList.h
@@ -10 +37 @@
 #ifndef _MetaObjectList_H__
 #define _MetaObjectList_H__
+
+#include "CorePrereqs.h"
 
 #include "ObjectList.h"

code/branches/FICN/src/orxonox/core/ObjectList.h

@@ -38 +38 @@
 #define _ObjectList_H__
 
+#include "CorePrereqs.h"
+
 namespace orxonox
 {
-    class OrxonoxClass; // Forward declaration
-
     // ###############################
     // ###    ObjectListElement    ###
@@ -73 +73 @@
     // ###       ObjectList        ###
     // ###############################
-    template <class T>
-    class Iterator; // Forward declaration
-
     //! The ObjectList contains all objects of a given class.
     /**

code/branches/FICN/src/orxonox/core/OrxonoxClass.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Fabian 'x3n' Landau
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
     @file OrxonoxClass.h
@@ -10 +37 @@
 #define _OrxonoxClass_H__
 
+#include <string>
+
+#include "CorePrereqs.h"
+
+#include "MetaObjectList.h"
 #include "Identifier.h"
-#include "IdentifierList.h"
-#include "ObjectList.h"
-#include "MetaObjectList.h"
 
 namespace orxonox
@@ -22 +51 @@
         OrxonoxClass is needed to create the class-hierarchy at startup and to store the Identifier and the MetaObjectList.
     */
-    class OrxonoxClass
+    class _CoreExport OrxonoxClass
     {
         public:

code/branches/FICN/src/orxonox/core/SignalHandler.cc

@@ -28 +28 @@
 #include <assert.h>
 
+#include "Debug.h"
 #include "SignalHandler.h"
-#include "Debug.h"
 
 SignalHandler * SignalHandler::singletonRef = NULL;

code/branches/FICN/src/orxonox/core/SignalHandler.h

@@ +1 @@
+/*
+ *   ORXONOX - the hottest 3D action shooter ever to exist
+ *
+ *
+ *   License notice:
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation; either version 2
+ *   of the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the Free Software
+ *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ *   Author:
+ *      Christoph Renner
+ *   Co-authors:
+ *      ...
+ *
+ */
+
 /*!
  * @file SignalHandler.h
@@ -8 +35 @@
 #include <list>
 #include <string>
+
+#include "CorePrereqs.h"
 
 typedef int (*SignalCallback)( void * someData );
@@ -58 +87 @@
 
 #else /* if defined __WIN32__ */
-class SignalHandler
+
+class _CoreExport SignalHandler
 {
  public: