Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 682


Ignore:
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
Files:
3 added
1 deleted
28 edited

Legend:

Unmodified
Added
Removed

  • code/branches/FICN/src/loader/LevelLoader.cc

    r681 r682  
    11/*
    2  *   ORXONOX - the hottest 3D action shooter ever to exist
    3  *
    4  *
    5  *   License notice:
    6  *
    7  *   This program is free software; you can redistribute it and/or
    8  *   modify it under the terms of the GNU General Public License
    9  *   as published by the Free Software Foundation; either version 2
    10  *   of the License, or (at your option) any later version.
    11  *
    12  *   This program is distributed in the hope that it will be useful,
    13  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  *   GNU General Public License for more details.
    16  *
    17  *   You should have received a copy of the GNU General Public License
    18  *   along with this program; if not, write to the Free Software
    19  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    20  *
    21  *   Author:
    22  *     Nicolas Perrenoud <nicolape@ee.ethz.ch>
    23  *   Co-authors:
    24  *      ...
    25  *
    26  */
    27 
    28 // #include <string>
    29 // #include <vector>
    30 // #include <iostream>
    31 #include <algorithm>
    32 #include <iterator>
    33 
     2*   ORXONOX - the hottest 3D action shooter ever to exist
     3*
     4*
     5*   License notice:
     6*
     7*   This program is free software; you can redistribute it and/or
     8*   modify it under the terms of the GNU General Public License
     9*   as published by the Free Software Foundation; either version 2
     10*   of the License, or (at your option) any later version.
     11*
     12*   This program is distributed in the hope that it will be useful,
     13*   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15*   GNU General Public License for more details.
     16*
     17*   You should have received a copy of the GNU General Public License
     18*   along with this program; if not, write to the Free Software
     19*   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20*
     21*   Author:
     22*     Nicolas Perrenoud <nicolape@ee.ethz.ch>
     23*   Co-authors:
     24*      ...
     25*
     26*/
     27
     28#include <OgreOverlay.h>
    3429#include <OgreOverlayManager.h>
    3530
     31#include "orxonox/core/Error.h"
     32#include "orxonox/core/Debug.h"
     33#include "orxonox/core/CoreIncludes.h"
     34
     35#include "audio/AudioManager.h"
     36#include "orxonox/objects/BaseObject.h"
     37#include "orxonox/Orxonox.h"
     38
    3639#include "LevelLoader.h"
    37 // #include "tinyxml/tinyxml.h"
    38 #include "orxonox/core/CoreIncludes.h"
    39 #include "orxonox/core/Error.h"
    40 #include "orxonox/objects/BaseObject.h"
    41 #include "audio/AudioManager.h"
    42 #include "orxonox/Orxonox.h"
    43 
    44 using namespace std;
    4540
    4641namespace loader
    4742{
    4843
    49 LevelLoader::LevelLoader(string file, string path)
    50 {
    51   valid_ = false;
    52 
    53   // Load XML level file
    54   path.append("/");
    55   path.append(file);
    56 
    57   // Open xml file
    58   doc.LoadFile(path);
    59 
    60   // Check if file was loaded
    61   if (doc.LoadFile())
     44  LevelLoader::LevelLoader(std::string file, std::string path)
    6245  {
    63     TiXmlHandle hDoc(&doc);
    64     TiXmlHandle hRoot(0);
    65     TiXmlElement* pElem;
    66 
    67     // Check for root element
    68     pElem = hDoc.FirstChildElement("orxonoxworld").Element();
    69     if (pElem)
     46    valid_ = false;
     47
     48    // Load XML level file
     49    path.append("/");
     50    path.append(file);
     51
     52    // Open xml file
     53    doc_.LoadFile(path);
     54
     55    // Check if file was loaded
     56    if (doc_.LoadFile())
    7057    {
    71       // Set root element
    72       hRoot = TiXmlHandle(pElem);
    73       rootElement = hRoot.Element();
    74 
    75       // Set level description
    76       pElem = hRoot.FirstChild("description").Element();
     58      TiXmlHandle hDoc(&doc_);
     59      TiXmlHandle hRoot(0);
     60      TiXmlElement* pElem;
     61
     62      // Check for root element
     63      pElem = hDoc.FirstChildElement("orxonoxworld").Element();
    7764      if (pElem)
    7865      {
    79         description_ = pElem->GetText();
    80       }
    81 
    82       // Set level name
    83       name_ = rootElement->Attribute("name");
    84       image_ = rootElement->Attribute("image");
    85 
    86       valid_ = true;
     66        // Set root element
     67        hRoot = TiXmlHandle(pElem);
     68        rootElement_ = hRoot.Element();
     69
     70        // Set level description
     71        pElem = hRoot.FirstChild("description").Element();
     72        if (pElem)
     73        {
     74          description_ = pElem->GetText();
     75        }
     76
     77        // Set level name
     78        name_ = rootElement_->Attribute("name");
     79        image_ = rootElement_->Attribute("image");
     80
     81        valid_ = true;
     82      }
     83      else
     84      {
     85        orxonox::Error("Level file has no valid root node");
     86      }
    8787    }
    8888    else
    8989    {
    90       orxonox::Error("Level file has no valid root node");
     90      orxonox::Error("Could not load level file ");
    9191    }
    9292  }
    93   else
    94   {
    95     orxonox::Error("Could not load level file ");
    96   }
    97 }
    9893
    9994  void LevelLoader::loadLevel()
    … …  
    111106
    112107      // Set loading screen
    113       loadElem = rootElement->FirstChildElement("loading");
     108      loadElem = rootElement_->FirstChildElement("loading");
    114109      if (loadElem)
    115110      {
    … …  
    145140      // Load audio
    146141      audio::AudioManager* auMan = orxonox::Orxonox::getSingleton()->getAudioManagerPointer();
    147       audioElem = rootElement->FirstChildElement("audio");
     142      audioElem = rootElement_->FirstChildElement("audio");
    148143
    149144      if (audioElem)
    … …  
    174169
    175170      // Load world
    176       worldElem = rootElement->FirstChildElement("world");
     171      worldElem = rootElement_->FirstChildElement("world");
    177172      if (worldElem)
    178173      {
    … …  
    192187            else
    193188            {
    194                 COUT(2) << "Warning: '"<< tElem->Value() <<"' is not a valid classname." << std::endl;
     189              COUT(2) << "Warning: '"<< tElem->Value() <<"' is not a valid classname." << std::endl;
    195190            }
    196191          }
    … …  
    201196      {
    202197        // FIXME: check for potential initialisation of mLoadOverlay
    203          mLoadOverlay->hide();
     198        mLoadOverlay->hide();
    204199      }
    205200
    … …  
    214209  }
    215210
    216 
    217 
    218211}
    219 

  • code/branches/FICN/src/loader/LevelLoader.h

    r678 r682  
    1010
    1111#include <string>
    12 #include <vector>
    13 #include <iostream>
    1412
    15 #include "LoaderPlatform.h"
     13#include "LoaderPrereqs.h"
    1614#include "tinyxml/tinyxml.h"
    1715
    18 //#include "xml/xmlParser.h"
    19 
     16class TiXmlDocument;   // Forward declaration
     17class TiXmlElement;    // Forward declaration
    2018
    2119namespace loader
    … …  
    2523  public:
    2624    // Constructors, loads the level file and some information data
    27     LevelLoader(std::string file, std::string dir="levels");
     25    LevelLoader(std::string file, std::string dir = "levels");
    2826    // Destructor
    29     ~LevelLoader();
     27    virtual ~LevelLoader();
    3028    // Loads all level data
    3129    void loadLevel();
    … …  
    5250
    5351    // Xml-Stuff
    54     TiXmlDocument doc;
    55     TiXmlElement* rootElement;
    56 
     52    TiXmlDocument doc_;
     53    TiXmlElement *rootElement_;
    5754  };
    5855}

  • code/branches/FICN/src/misc/Tokenizer.h

    r676 r682  
    44#include <string>
    55#include <iostream>
     6#include <vector>
    67
    78/**

  • code/branches/FICN/src/orxonox/Orxonox.h

    r673 r682  
    1212
    1313#include "OrxonoxPrereqs.h"
     14#include "loader/LoaderPrereqs.h"
    1415#include "GraphicsEngine.h"
    1516
    … …  
    2526    PRESENTATION
    2627  };
    27 
    28   class OrxListener;
    2928
    3029  class Orxonox

  • code/branches/FICN/src/orxonox/OrxonoxPrereqs.h

    r673 r682  
    2020 *
    2121 *   Author:
    22  *      Reto Grieder, (C) 2007
     22 *      Reto Grieder
    2323 *   Co-authors:
    2424 *      ...
    … …  
    2727
    2828/**
    29  @file  OrxonoxPrereq.cc
    30  @brief Contains all the necessary forward declarations for all classes, structs and enums.
     29 @file  OrxonoxPrereq.h
     30 @brief Contains all the necessary forward declarations for all classes and structs.
    3131 */
    3232
    … …  
    3434#define _OrxonoxPrereqs_H__
    3535
    36 // hack for the usleep/Sleep problem
    37 #ifdef WIN32
    38 #include <windows.h>
    39 #define usleep(x) Sleep((x)/1000)
    40 #else
    41 #include <unistd.h>
    42 #endif
     36#include "OrxonoxPlatform.h"
    4337
    4438// classes that have not yet been put into a namespace
    4539class InputManager;
    46 class SignalHandler;
    4740class SpaceShipSteering;
    48 template <class T>
    49 class String2Number;
    5041
    5142namespace orxonox {
    … …  
    5445  class BaseObject;
    5546  class Camera;
    56   template <class T>
    57   class ClassFactory;
    5847  class Entity;
    5948  class GraphicsEngine;
    … …  
    7564  class WorldEntity;
    7665
    77   // from core library
    78   class ArgReader;
    79   class BaseFactory;
    80   class BaseMetaObjectListElement;
    81   template <class T>
    82   class ClassFactory;
    83   template <class T>
    84   class ClassIdentifier;
    85   class ConfigValueContainer;
    86   class DebugLevel;
    87   class Error;
    88   class Factory;
    89   class Identifier;
    90   class IdentifierList;
    91   class IdentifierListElement;
    92   template <class T>
    93   class Iterator;
    94   class MetaObjectList;
    95   template <class T>
    96   class MetaObjectListElement;
    97   template <class T>
    98   class ObjectList;
    99   template <class T>
    100   class ObjectListElement;
    101   class OrxonoxClass;
    102   template <class T>
    103   class SubclassIdentifier;
    104 
    10566  class AmmunitionDump;
    10667  class Bullet;
    … …  
    12081namespace hud {
    12182  class HUD;
    122 }
    123 
    124 namespace loader {
    125   class LevelLoader;
    12683}
    12784

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Benjamin Knecht <beni_at_orxonox.net>
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/**
    229 @file  Argreader.h
    … …  
    1037#include <string>
    1138
     39#include "CorePrereqs.h"
     40
    1241namespace orxonox {
    1342
    14   class ArgReader
     43  class _CoreExport ArgReader
    1544  {
    1645    public:

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

    r677 r682  
    3636#define _ClassFactory_H__
    3737
     38#include <string>
     39
     40#include "CorePrereqs.h"
     41
     42#include "Factory.h"
    3843#include "Identifier.h"
    3944#include "Debug.h"

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

    r677 r682  
    2727
    2828#include <fstream>
    29 #include "ConfigValueContainer.h"
     29
    3030#include "../../misc/Tokenizer.h"
    3131#include "../../misc/String2Number.h"
     32#include "ConfigValueContainer.h"
    3233
    3334#define CONFIGFILEPATH "orxonox.ini"

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file ConfigValueContainer.h
    … …  
    1845#include <string>
    1946#include <list>
     47
     48#include "CorePrereqs.h"
    2049
    2150#include "OgreVector2.h"
    … …  
    4170        If there is no section, the section and the entry are added to the end of the config-file.
    4271    */
    43     class ConfigValueContainer
     72    class _CoreExport ConfigValueContainer
    4473    {
    4574        public:

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

    r677 r682  
    2626 */
    2727
    28 #ifndef _CoreIncludes_H__
    29 #define _CoreIncludes_H__
    30 
    3128/**
    3229    @file CoreIncludes.h
    … …  
    3936    the of the class implementation, so it gets executed before main().
    4037*/
     38
     39#ifndef _CoreIncludes_H__
     40#define _CoreIncludes_H__
     41
     42#include "CorePrereqs.h"
    4143
    4244// All needed header-files

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

    r670 r682  
    3737
    3838#include <stdio.h>
    39 
    40 int getSoftDebugLevel();
     39#include <iostream>
     40
     41#include "CorePrereqs.h"
     42
     43extern "C" _CoreExport int getSoftDebugLevel();
    4144
    4245// DEFINE ERROR MODES

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

    r670 r682  
    2727
    2828#include "CoreIncludes.h"
     29#include "Debug.h"
    2930#include "DebugLevel.h"
    30 #include "Debug.h"
    3131
    3232namespace orxonox

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _DebugLevel_H__
    229#define _DebugLevel_H__
     30
     31#include "CorePrereqs.h"
    332
    433#include "OrxonoxClass.h"
    … …  
    635namespace orxonox
    736{
    8     class DebugLevel : public OrxonoxClass
     37    class _CoreExport DebugLevel : public OrxonoxClass
    938    {
    1039        public:

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128#ifndef _Error_H__
    229#define _Error_H__
    330
    4 #include <iostream>
    531#include <string>
     32
     33#include "CorePrereqs.h"
    634
    735namespace orxonox
    836{
    9         class Error
     37        class _CoreExport Error
    1038        {
    1139        public:

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

    r677 r682  
    3131*/
    3232
    33 #include "Factory.h"
    3433#include "Identifier.h"
    3534#include "Debug.h"
    3635#include "../objects/BaseObject.h"
     36#include "Factory.h"
    3737
    3838namespace orxonox

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file Factory.h
    … …  
    2047#include <string>
    2148
     49#include "CorePrereqs.h"
     50
    2251namespace orxonox
    2352{
    2453    class BaseObject; // Forward declaration
    25     class Identifier; // Forward declaration
    2654
    2755    // ###############################
    … …  
    2957    // ###############################
    3058    //! The Factory is used to map the name or the network ID of a class with its Identifier.
    31     class Factory
     59    class _CoreExport Factory
    3260    {
    3361        public:
    … …  
    5381    // ###############################
    5482    //! Base-class of ClassFactory. Has to be defined separate because of circular dependencies.
    55     class BaseFactory
     83    class _CoreExport BaseFactory
    5684    {
    5785        public:

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

    r677 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file Identifier.h
    … …  
    2552#define _Identifier_H__
    2653
    27 #include <iostream>
     54#include <string>
    2855#include <map>
    2956
     57#include "CorePrereqs.h"
     58
     59#include "ObjectList.h"
    3060#include "IdentifierList.h"
    31 #include "ObjectList.h"
    3261#include "Factory.h"
    33 #include "ConfigValueContainer.h"
    3462#include "Debug.h"
     63// These two files would actually be need, but they would produce
     64// circular dependencies. Anyway, it does compile without them
     65//#include "OrxonoxClass.h"
     66//#include "MetaObjectList.h"
    3567
    3668namespace orxonox
    … …  
    5688        You can't directly create an Identifier, it's just the base-class for ClassIdentifier.
    5789    */
    58     class Identifier
     90    class _CoreExport Identifier
    5991    {
    6092        template <class T>

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

    r673 r682  
    1 #ifndef _IdentifierList_H__
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    228/*!
    329    @file IdentifierList.h
    … …  
    834*/
    935
     36#ifndef _IdentifierList_H__
    1037#define _IdentifierList_H__
    1138
    1239#include <string>
    1340
     41#include "CorePrereqs.h"
     42
    1443namespace orxonox
    1544{
    16     class Identifier; // Forward declaration
    17 
    1845    //! The list-element of the IdentifierList
    1946    class IdentifierListElement
    … …  
    2754
    2855    //! The IdentifierList contains Identifiers
    29     class IdentifierList
     56    class _CoreExport IdentifierList
    3057    {
    3158        public:

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

    r677 r682  
    4646#define _Iterator_H__
    4747
     48#include "CorePrereqs.h"
     49
     50#include "ObjectList.h"
    4851#include "Debug.h"
    4952

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

    r677 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file MetaObjectList.h
    … …  
    1037#ifndef _MetaObjectList_H__
    1138#define _MetaObjectList_H__
     39
     40#include "CorePrereqs.h"
    1241
    1342#include "ObjectList.h"

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

    r673 r682  
    3838#define _ObjectList_H__
    3939
     40#include "CorePrereqs.h"
     41
    4042namespace orxonox
    4143{
    42     class OrxonoxClass; // Forward declaration
    43 
    4444    // ###############################
    4545    // ###    ObjectListElement    ###
    … …  
    7373    // ###       ObjectList        ###
    7474    // ###############################
    75     template <class T>
    76     class Iterator; // Forward declaration
    77 
    7875    //! The ObjectList contains all objects of a given class.
    7976    /**

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Fabian 'x3n' Landau
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229    @file OrxonoxClass.h
    … …  
    1037#define _OrxonoxClass_H__
    1138
     39#include <string>
     40
     41#include "CorePrereqs.h"
     42
     43#include "MetaObjectList.h"
    1244#include "Identifier.h"
    13 #include "IdentifierList.h"
    14 #include "ObjectList.h"
    15 #include "MetaObjectList.h"
    1645
    1746namespace orxonox
    … …  
    2251        OrxonoxClass is needed to create the class-hierarchy at startup and to store the Identifier and the MetaObjectList.
    2352    */
    24     class OrxonoxClass
     53    class _CoreExport OrxonoxClass
    2554    {
    2655        public:

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

    r670 r682  
    2828#include <assert.h>
    2929
     30#include "Debug.h"
    3031#include "SignalHandler.h"
    31 #include "Debug.h"
    3232
    3333SignalHandler * SignalHandler::singletonRef = NULL;

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

    r673 r682  
     1/*
     2 *   ORXONOX - the hottest 3D action shooter ever to exist
     3 *
     4 *
     5 *   License notice:
     6 *
     7 *   This program is free software; you can redistribute it and/or
     8 *   modify it under the terms of the GNU General Public License
     9 *   as published by the Free Software Foundation; either version 2
     10 *   of the License, or (at your option) any later version.
     11 *
     12 *   This program is distributed in the hope that it will be useful,
     13 *   but WITHOUT ANY WARRANTY; without even the implied warranty of
     14 *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     15 *   GNU General Public License for more details.
     16 *
     17 *   You should have received a copy of the GNU General Public License
     18 *   along with this program; if not, write to the Free Software
     19 *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     20 *
     21 *   Author:
     22 *      Christoph Renner
     23 *   Co-authors:
     24 *      ...
     25 *
     26 */
     27
    128/*!
    229 * @file SignalHandler.h
    … …  
    835#include <list>
    936#include <string>
     37
     38#include "CorePrereqs.h"
    1039
    1140typedef int (*SignalCallback)( void * someData );
    … …  
    5887
    5988#else /* if defined __WIN32__ */
    60 class SignalHandler
     89
     90class _CoreExport SignalHandler
    6191{
    6292 public:

  • code/branches/FICN/visual_studio/FICN.sln

    r678 r682  
    66                Debug.AspNetCompiler.Debug = "True"
    77                Release.AspNetCompiler.Debug = "False"
     8        EndProjectSection
     9        ProjectSection(ProjectDependencies) = postProject
     10                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    811        EndProjectSection
    912EndProject
    … …  
    3740                Debug.AspNetCompiler.Debug = "True"
    3841                Release.AspNetCompiler.Debug = "False"
     42        EndProjectSection
     43        ProjectSection(ProjectDependencies) = postProject
     44                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
     45                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    3946        EndProjectSection
    4047EndProject

  • code/branches/FICN/visual_studio/benixonox.vcproj

    r679 r682  
    4040                                Name="VCCLCompilerTool"
    4141                                AdditionalIncludeDirectories=""
    42                                 PreprocessorDefinitions="LOADER_STATIC"
     42                                PreprocessorDefinitions="LOADER_STATIC_BUILD"
    4343                                PrecompiledHeaderThrough=""
    4444                        />
    … …  
    109109                                Name="VCCLCompilerTool"
    110110                                AdditionalIncludeDirectories=""
    111                                 PreprocessorDefinitions="LOADER_STATIC"
     111                                PreprocessorDefinitions="LOADER_STATIC_BUILD"
    112112                        />
    113113                        <Tool
    … …  
    334334                        </File>
    335335                        <File
     336                                RelativePath="..\src\orxonox\OrxonoxPlatform.h"
     337                                >
     338                        </File>
     339                        <File
    336340                                RelativePath="..\src\orxonox\OrxonoxPrereqs.h"
    337341                                >

  • code/branches/FICN/visual_studio/core.vcproj

    r678 r682  
    1818                <Configuration
    1919                        Name="Debug|Win32"
    20                         ConfigurationType="4"
     20                        ConfigurationType="2"
    2121                        InheritedPropertySheets=".\base_properties_debug.vsprops"
    2222                        CharacterSet="1"
    … …  
    4040                                Name="VCCLCompilerTool"
    4141                                AdditionalIncludeDirectories=""
     42                                PreprocessorDefinitions="CORE_SHARED_BUILD"
    4243                        />
    4344                        <Tool
    … …  
    5152                        />
    5253                        <Tool
    53                                 Name="VCLibrarianTool"
     54                                Name="VCLinkerTool"
     55                                AdditionalDependencies="OgreMain_d.lib"
    5456                        />
    5557                        <Tool
    … …  
    5759                        />
    5860                        <Tool
     61                                Name="VCManifestTool"
     62                        />
     63                        <Tool
    5964                                Name="VCXDCMakeTool"
    6065                        />
    … …  
    6469                        <Tool
    6570                                Name="VCFxCopTool"
     71                        />
     72                        <Tool
     73                                Name="VCAppVerifierTool"
     74                        />
     75                        <Tool
     76                                Name="VCWebDeploymentTool"
    6677                        />
    6778                        <Tool
    … …  
    7182                <Configuration
    7283                        Name="Release|Win32"
    73                         ConfigurationType="4"
     84                        ConfigurationType="2"
    7485                        InheritedPropertySheets=".\base_properties_release.vsprops"
    7586                        CharacterSet="1"
    … …  
    94105                                Name="VCCLCompilerTool"
    95106                                AdditionalIncludeDirectories=""
     107                                PreprocessorDefinitions="CORE_SHARED_BUILD"
    96108                        />
    97109                        <Tool
    … …  
    105117                        />
    106118                        <Tool
    107                                 Name="VCLibrarianTool"
     119                                Name="VCLinkerTool"
     120                                AdditionalDependencies="OgreMain.lib"
    108121                        />
    109122                        <Tool
    … …  
    111124                        />
    112125                        <Tool
     126                                Name="VCManifestTool"
     127                        />
     128                        <Tool
    113129                                Name="VCXDCMakeTool"
    114130                        />
    … …  
    118134                        <Tool
    119135                                Name="VCFxCopTool"
     136                        />
     137                        <Tool
     138                                Name="VCAppVerifierTool"
     139                        />
     140                        <Tool
     141                                Name="VCWebDeploymentTool"
    120142                        />
    121143                        <Tool
    … …  
    195217                        </File>
    196218                        <File
     219                                RelativePath="..\src\orxonox\core\CorePrereqs.h"
     220                                >
     221                        </File>
     222                        <File
    197223                                RelativePath="..\src\orxonox\core\Debug.h"
    198224                                >

  • code/branches/FICN/visual_studio/loader.vcproj

    r678 r682  
    4040                                Name="VCCLCompilerTool"
    4141                                AdditionalIncludeDirectories=""
    42                                 PreprocessorDefinitions="LOADER_STATIC"
     42                                PreprocessorDefinitions="LOADER_STATIC_BUILD"
    4343                        />
    4444                        <Tool
    … …  
    9595                                Name="VCCLCompilerTool"
    9696                                AdditionalIncludeDirectories=""
    97                                 PreprocessorDefinitions="LOADER_STATIC"
     97                                PreprocessorDefinitions="LOADER_STATIC_BUILD"
    9898                        />
    9999                        <Tool
    … …  
    149149                        </File>
    150150                        <File
    151                                 RelativePath="..\src\loader\LoaderPlatform.h"
     151                                RelativePath="..\src\loader\LoaderPrereqs.h"
    152152                                >
    153153                        </File>
Note: See TracChangeset for help on using the changeset viewer.