Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2569


Ignore:
Timestamp:
Jan 6, 2009, 10:38:41 AM (16 years ago)
Author:
rgrieder
Message:

Moved OgreCEGUIRenderer to its own folder in src since it's actually a library.

Location:
code/branches/buildsystem2
Files:
7 added
7 edited
6 moved

Legend:

Unmodified
Added
Removed

  • code/branches/buildsystem2/src/CMakeLists.txt

    r2567 r2569  
    1818INCLUDE_DIRECTORIES(
    1919  cpptcl
     20  ogreceguirenderer
    2021  ois
    2122  tinyxml
    … …  
    3536
    3637ADD_SUBDIRECTORY(cpptcl)
     38ADD_SUBDIRECTORY(ogreceguirenderer)
    3739ADD_SUBDIRECTORY(ois)
    3840ADD_SUBDIRECTORY(tinyxml)

  • code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIRenderer.cpp

    r2533 r2569  
    2525*************************************************************************/
    2626
    27 #include "OrxonoxStableHeaders.h"
    2827#include <CEGUIImagesetManager.h>
    2928#include <CEGUIImageset.h>

  • code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIRenderer.h

    r2533 r2569  
    2727    This file contains code that is specific to Ogre (http://www.ogre3d.org)
    2828*************************************************************************/
    29 #ifndef _OgreCEGUIRenderer_H__
    30 #define _OgreCEGUIRenderer_H__
     29#ifndef _OgreCEGUIRenderer_h_
     30#define _OgreCEGUIRenderer_h_
    3131
    3232#include <CEGUIBase.h>
    … …  
    3838#include <OgreTextureUnitState.h>
    3939
    40 /** CHANGES MADE BY ORXONOX TO FIT DLL IMPORT/EXPORT **/
    41 #if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !(defined(ORXONOX_STATIC_BUILD) || defined(ORXONOX_NO_EXPORTS))
    42 #   ifdef ORXONOX_SHARED_BUILD
     40#if (OGRE_PLATFORM == OGRE_PLATFORM_WIN32) && !defined(OGRE_STATIC_LIB)
     41#   ifdef OGRE_GUIRENDERER_EXPORTS
    4342#       define OGRE_GUIRENDERER_API __declspec(dllexport)
    4443#   else
    … …  
    463462
    464463
    465 #endif  // end of guard _OgreCEGUIRenderer_H__
     464#endif  // end of guard _OgreCEGUIRenderer_h_

  • code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIResourceProvider.cpp

    r2533 r2569  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    26 #include "OrxonoxStableHeaders.h"
    2726#include "OgreCEGUIResourceProvider.h"
    2827

  • code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUIResourceProvider.h

    r2533 r2569  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    26 #ifndef _OgreCEGUIResourceProvider_H__
    27 #define _OgreCEGUIResourceProvider_H__
     26#ifndef _OgreCEGUIResourceProvider_h_
     27#define _OgreCEGUIResourceProvider_h_
    2828
    2929#include <CEGUIResourceProvider.h>
    … …  
    5050} // End of  CEGUI namespace section
    5151
    52 #endif  // end of guard _OgreCEGUIResourceProvider_H__
     52#endif  // end of guard _OgreCEGUIResourceProvider_h_

  • code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUITexture.cpp

    r2533 r2569  
    2525*************************************************************************/
    2626
    27 #include "OrxonoxStableHeaders.h"
    2827#include <CEGUISystem.h>
    2928#include <CEGUIExceptions.h>

  • code/branches/buildsystem2/src/ogreceguirenderer/OgreCEGUITexture.h

    r2533 r2569  
    2424    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    2525*************************************************************************/
    26 #ifndef _OgreCEGUITexture_H__
    27 #define _OgreCEGUITexture_H__
     26#ifndef _OgreCEGUITexture_h_
     27#define _OgreCEGUITexture_h_
    2828
    2929#include <CEGUIBase.h>
    … …  
    177177
    178178
    179 #endif  // end of guard _OgreCEGUITexture_H__
     179#endif  // end of guard _OgreCEGUITexture_h_

  • code/branches/buildsystem2/src/orxonox/CMakeLists.txt

    r2546 r2569  
    4040  #${CEGUI_SCRIPT_LIBRARIES}
    4141  ceguilua_orxonox
     42  ogreceguirenderer_orxonox
    4243  tinyxml_orxonox
    4344  tolualib_orxonox

  • code/branches/buildsystem2/src/orxonox/gui/CMakeLists.txt

    r2518 r2569  
    11ADD_SOURCE_FILES(
    22  GUIManager.cc
    3   OgreCEGUIRenderer.cpp
    4   OgreCEGUIResourceProvider.cpp
    5   OgreCEGUITexture.cpp
    63)

  • code/branches/buildsystem2/src/orxonox/gui/GUIManager.cc

    r2568 r2569  
    4040#include <CEGUI.h>
    4141#include <CEGUILua.h>
     42#include <OgreCEGUIRenderer.h>
     43
    4244#include "util/Exception.h"
    4345#include "core/input/InputManager.h"
    … …  
    4749#include "core/ToluaBindCore.h"
    4850#include "ToluaBindOrxonox.h"
    49 #include "OgreCEGUIRenderer.h"
    5051
    5152extern "C" {

  • code/branches/buildsystem2/visual_studio/vc8/base.vsprops

    r2567 r2569  
    88        <Tool
    99                Name="VCCLCompilerTool"
    10                 AdditionalIncludeDirectories="&quot;$(RootDir)src&quot;;&quot;$(RootDir)\build\$(SolutionName)\$(ConfigurationName)&quot;;&quot;$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\orxonox&quot;;&quot;$(RootDir)src\cpptcl&quot;;&quot;$(RootDir)src\tinyxml&quot;;&quot;$(RootDir)src\tolua&quot;;&quot;$(RootDir)src\ois&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\ceguilua-0.6.1\ceguilua&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;;&quot;$(LibDir)lua-5.1.3\include&quot;"
     10                AdditionalIncludeDirectories="&quot;$(RootDir)src&quot;;&quot;$(RootDir)\build\$(SolutionName)\$(ConfigurationName)&quot;;&quot;$(RootDir)\build\$(SolutionName)\$(ConfigurationName)\orxonox&quot;;&quot;$(RootDir)src\cpptcl&quot;;&quot;$(RootDir)src\tinyxml&quot;;&quot;$(RootDir)src\tolua&quot;;&quot;$(RootDir)src\ois&quot;;&quot;$(RootDir)src\orxonox&quot;;&quot;$(RootDir)src\ceguilua-0.6.1\ceguilua&quot;;&quot;$(RootDir)src\ogreceguirenderer&quot;;&quot;$(LibDir)ogre-1.4.9\include&quot;;&quot;$(LibDir)boost-1.35.0\include&quot;;&quot;$(LibDir)cegui-0.6.1\include&quot;;&quot;$(LibDir)enet-1.2\include&quot;;&quot;$(LibDir)libogg-1.1.3\include&quot;;&quot;$(LibDir)libvorbis-1.2.0\include&quot;;&quot;$(LibDir)openal-1.1\include&quot;;&quot;$(LibDir)freealut-1.1.0\include&quot;;&quot;$(LibDir)tcl-8.5.2\include&quot;;&quot;$(LibDir)zlib-1.2.3\include&quot;;&quot;$(LibDir)lua-5.1.3\include&quot;"
    1111                PreprocessorDefinitions="WIN32;__WIN32__;_WIN32;_WINDOWS;BOOST_ALL_DYN_LINK;OIS_DYNAMIC_LIB;ZLIB_WINAPI;LUA_BUILD_AS_DLL;TIXML_USE_TICPP;_CRT_SECURE_NO_WARNINGS"
    1212                WarningLevel="3"

  • code/branches/buildsystem2/visual_studio/vc8/orxonox.vcproj

    r2547 r2569  
    755755                                        >
    756756                                </File>
    757                                 <File
    758                                         RelativePath="..\..\src\orxonox\gui\OgreCEGUIRenderer.cpp"
    759                                         >
    760                                 </File>
    761                                 <File
    762                                         RelativePath="..\..\src\orxonox\gui\OgreCEGUIResourceProvider.cpp"
    763                                         >
    764                                 </File>
    765                                 <File
    766                                         RelativePath="..\..\src\orxonox\gui\OgreCEGUITexture.cpp"
    767                                         >
    768                                 </File>
    769757                        </Filter>
    770758                        <Filter
    … …  
    12391227                                <File
    12401228                                        RelativePath="..\..\src\orxonox\gui\GUIManager.h"
    1241                                         >
    1242                                 </File>
    1243                                 <File
    1244                                         RelativePath="..\..\src\orxonox\gui\OgreCEGUIRenderer.h"
    1245                                         >
    1246                                 </File>
    1247                                 <File
    1248                                         RelativePath="..\..\src\orxonox\gui\OgreCEGUIResourceProvider.h"
    1249                                         >
    1250                                 </File>
    1251                                 <File
    1252                                         RelativePath="..\..\src\orxonox\gui\OgreCEGUITexture.h"
    12531229                                        >
    12541230                                </File>

  • code/branches/buildsystem2/visual_studio/vc8/orxonox_vc8.sln

    r2520 r2569  
    1717Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core.vcproj", "{271715F3-5B90-4110-A552-70C788084A86}"
    1818        ProjectSection(ProjectDependencies) = postProject
     19                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
     20                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
     21                {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
     22                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
     23                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    1924                {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}
    20                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    21                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    22                 {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {53C56131-E2AA-4A27-B460-7AC05D61A0E6}
    23                 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
    24                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    2525        EndProjectSection
    2626EndProject
    2727Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "network", "network.vcproj", "{35575B59-E1AE-40E8-89C4-2862B5B09B68}"
    2828        ProjectSection(ProjectDependencies) = postProject
     29                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
     30                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    2931                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    30                 {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    31                 {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    3232        EndProjectSection
    3333EndProject
    3434Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orxonox", "orxonox.vcproj", "{0B6C5CFD-F91B-432A-80A3-2610F61E060B}"
    3535        ProjectSection(ProjectDependencies) = postProject
     36                {0301EB55-B3DE-487F-BE65-8EB6D26CC31D} = {0301EB55-B3DE-487F-BE65-8EB6D26CC31D}
     37                {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
     38                {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
     39                {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
     40                {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
     41                {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    3642                {F101C2F0-1CB9-4A57-827B-6C399A99B28F} = {F101C2F0-1CB9-4A57-827B-6C399A99B28F}
    3743                {271715F3-5B90-4110-A552-70C788084A86} = {271715F3-5B90-4110-A552-70C788084A86}
    38                 {2240ECD7-2F48-4431-8E1B-25466A384CCC} = {2240ECD7-2F48-4431-8E1B-25466A384CCC}
    39                 {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F} = {4BBBB49F-3203-4BB4-AAE3-48BCA96FCB4F}
    40                 {35575B59-E1AE-40E8-89C4-2862B5B09B68} = {35575B59-E1AE-40E8-89C4-2862B5B09B68}
    41                 {A0724246-CB7C-420B-BCF0-68EF205AFE34} = {A0724246-CB7C-420B-BCF0-68EF205AFE34}
    42                 {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626} = {35E36A06-0A5C-4A0D-9AB6-5A05EAA87626}
    4344        EndProjectSection
    4445EndProject
    … …  
    5152EndProject
    5253Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "externals", "externals", "{B9D56701-B4DB-43F8-9920-241CA418C1CE}"
     54EndProject
     55Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogreceguirenderer", "ogreceguirenderer.vcproj", "{0301EB55-B3DE-487F-BE65-8EB6D26CC31D}"
    5356EndProject
    5457Global
    … …  
    98101                {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}.Release|Win32.ActiveCfg = Release|Win32
    99102                {EA969DF2-70AF-46E6-BBE2-E03112E04CB8}.Release|Win32.Build.0 = Release|Win32
     103                {0301EB55-B3DE-487F-BE65-8EB6D26CC31D}.Debug|Win32.ActiveCfg = Debug|Win32
     104                {0301EB55-B3DE-487F-BE65-8EB6D26CC31D}.Debug|Win32.Build.0 = Debug|Win32
     105                {0301EB55-B3DE-487F-BE65-8EB6D26CC31D}.Release|Win32.ActiveCfg = Release|Win32
     106                {0301EB55-B3DE-487F-BE65-8EB6D26CC31D}.Release|Win32.Build.0 = Release|Win32
    100107        EndGlobalSection
    101108        GlobalSection(SolutionProperties) = preSolution
    … …  
    109116                {EA969DF2-70AF-46E6-BBE2-E03112E04CB8} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
    110117                {53C56131-E2AA-4A27-B460-7AC05D61A0E6} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
     118                {0301EB55-B3DE-487F-BE65-8EB6D26CC31D} = {B9D56701-B4DB-43F8-9920-241CA418C1CE}
    111119        EndGlobalSection
    112120EndGlobal
Note: See TracChangeset for help on using the changeset viewer.