Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 2567


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

Added all paths of included external libraries to the include directories and used ≠ for the includes.
Also added src/orxonox binary directory for consistency.

Location:
code/branches/buildsystem2
Files:
12 edited

Legend:

Unmodified
Added
Removed

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

    r2522 r2567  
    1717
    1818INCLUDE_DIRECTORIES(
     19  cpptcl
     20  ois
     21  tinyxml
     22  tolua
     23)
     24
     25INCLUDE_DIRECTORIES(
    1926  .
    20   ois
    2127  orxonox
    22   tolua
    2328  # Required for tolua bind files that are in the build folder
    2429  ${CMAKE_CURRENT_BINARY_DIR}
     30  ${CMAKE_CURRENT_BINARY_DIR}/orxonox
    2531)
    2632

  • code/branches/buildsystem2/src/core/BaseObject.cc

    r2171 r2567  
    3333
    3434#include "BaseObject.h"
    35 #include "tinyxml/tinyxml.h"
     35
     36#include <tinyxml.h>
     37
    3638#include "CoreIncludes.h"
    3739#include "EventIncludes.h"

  • code/branches/buildsystem2/src/core/IRC.h

    r1505 r2567  
    3232#include "CorePrereqs.h"
    3333
     34#include <CppTcl.h>
    3435#include "OrxonoxClass.h"
    35 #include "cpptcl/CppTcl.h"
    3636
    3737namespace orxonox

  • code/branches/buildsystem2/src/core/Loader.cc

    r2171 r2567  
    2828
    2929#include "Loader.h"
     30
     31#include <ticpp.h>
     32
    3033#include "XMLFile.h"
    3134#include "BaseObject.h"
    … …  
    3942#include "util/Exception.h"
    4043
    41 #include "tinyxml/ticpp.h"
    42 
    4344namespace orxonox
    4445{

  • code/branches/buildsystem2/src/core/LuaBind.cc

    r2510 r2567  
    3333
    3434extern "C" {
    35 #include "lua.h"
    36 #include "lualib.h"
     35#include <lua.h>
     36#include <lualib.h>
    3737}
    38 #include "tolua++.h"
     38#include <tolua++.h>
     39
    3940#include "core/ToluaBindCore.h"
    4041#include "util/String.h"

  • code/branches/buildsystem2/src/core/TclBind.h

    r1792 r2567  
    3232#include "CorePrereqs.h"
    3333
    34 #include "cpptcl/CppTcl.h"
     34#include <CppTcl.h>
    3535
    3636namespace orxonox

  • code/branches/buildsystem2/src/core/TclThreadManager.h

    r1792 r2567  
    4040#include <boost/thread/thread.hpp>
    4141
    42 #include "cpptcl/CppTcl.h"
     42#include <CppTcl.h>
    4343#include "core/OrxonoxClass.h"
    4444

  • code/branches/buildsystem2/src/core/Template.cc

    r2261 r2567  
    2929#include "Template.h"
    3030
     31#include <ticpp.h>
     32
    3133#include "core/CoreIncludes.h"
    3234#include "core/XMLPort.h"
    3335#include "util/Debug.h"
    34 #include "tinyxml/ticpp.h"
    3536
    3637namespace orxonox

  • code/branches/buildsystem2/src/core/Template.h

    r2261 r2567  
    3434#include "CorePrereqs.h"
    3535
     36#include <tinyxml.h>
    3637#include "BaseObject.h"
    37 #include "tinyxml/tinyxml.h"
    3838
    3939namespace orxonox

  • code/branches/buildsystem2/src/core/XMLPort.h

    r2171 r2567  
    4343#include "CorePrereqs.h"
    4444
     45#include <ticpp.h>
    4546#include "util/Debug.h"
    4647#include "util/Exception.h"
    4748#include "util/MultiType.h"
    48 #include "tinyxml/ticpp.h"
    4949#include "XMLIncludes.h"
    5050#include "Executor.h"

  • code/branches/buildsystem2/src/orxonox/pch/havepch/OrxonoxStableHeaders.h

    r2546 r2567  
    5353//#include <boost/thread/thread.hpp>
    5454#include <boost/static_assert.hpp>
    55 #include "tinyxml/ticpp.h"
    56 #include "tinyxml/tinyxml.h"
    57 #include "tolua/tolua++.h"
     55#include <ticpp.h>
     56#include <tolua++.h>
    5857
    5958//Get around Windows hackery (windows.h is included by Ogre.h)

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

    r2520 r2567  
    88        <Tool
    99                Name="VCCLCompilerTool"
    10                 AdditionalIncludeDirectories="&quot;$(RootDir)src&quot;;&quot;$(RootDir)\build\$(SolutionName)\$(ConfigurationName)&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;$(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"
Note: See TracChangeset for help on using the changeset viewer.