Changeset 2567 for code/branches/buildsystem2

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:

• src/CMakeLists.txt (modified) (1 diff)
• src/core/BaseObject.cc (modified) (1 diff)
• src/core/IRC.h (modified) (1 diff)
• src/core/Loader.cc (modified) (2 diffs)
• src/core/LuaBind.cc (modified) (1 diff)
• src/core/TclBind.h (modified) (1 diff)
• src/core/TclThreadManager.h (modified) (1 diff)
• src/core/Template.cc (modified) (1 diff)
• src/core/Template.h (modified) (1 diff)
• src/core/XMLPort.h (modified) (1 diff)
• src/orxonox/pch/havepch/OrxonoxStableHeaders.h (modified) (1 diff)
• visual_studio/vc8/base.vsprops (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -17 +17 @@
 
 INCLUDE_DIRECTORIES(
+  cpptcl
+  ois
+  tinyxml
+  tolua
+)
+
+INCLUDE_DIRECTORIES(
   .
-  ois
   orxonox
-  tolua
   # Required for tolua bind files that are in the build folder
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}/orxonox
 )
 

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

@@ -33 +33 @@
 
 #include "BaseObject.h"
-#include "tinyxml/tinyxml.h"
+
+#include <tinyxml.h>
+
 #include "CoreIncludes.h"
 #include "EventIncludes.h"

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

@@ -32 +32 @@
 #include "CorePrereqs.h"
 
+#include <CppTcl.h>
 #include "OrxonoxClass.h"
-#include "cpptcl/CppTcl.h"
 
 namespace orxonox

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

@@ -28 +28 @@
 
 #include "Loader.h"
+
+#include <ticpp.h>
+
 #include "XMLFile.h"
 #include "BaseObject.h"
@@ -39 +42 @@
 #include "util/Exception.h"
 
-#include "tinyxml/ticpp.h"
-
 namespace orxonox
 {

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

@@ -33 +33 @@
 
 extern "C" {
-#include "lua.h"
-#include "lualib.h"
+#include <lua.h>
+#include <lualib.h>
 }
-#include "tolua++.h"
+#include <tolua++.h>
+
 #include "core/ToluaBindCore.h"
 #include "util/String.h"

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

@@ -32 +32 @@
 #include "CorePrereqs.h"
 
-#include "cpptcl/CppTcl.h"
+#include <CppTcl.h>
 
 namespace orxonox

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

@@ -40 +40 @@
 #include <boost/thread/thread.hpp>
 
-#include "cpptcl/CppTcl.h"
+#include <CppTcl.h>
 #include "core/OrxonoxClass.h"
 

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

@@ -29 +29 @@
 #include "Template.h"
 
+#include <ticpp.h>
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
 #include "util/Debug.h"
-#include "tinyxml/ticpp.h"
 
 namespace orxonox

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

@@ -34 +34 @@
 #include "CorePrereqs.h"
 
+#include <tinyxml.h>
 #include "BaseObject.h"
-#include "tinyxml/tinyxml.h"
 
 namespace orxonox

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

@@ -43 +43 @@
 #include "CorePrereqs.h"
 
+#include <ticpp.h>
 #include "util/Debug.h"
 #include "util/Exception.h"
 #include "util/MultiType.h"
-#include "tinyxml/ticpp.h"
 #include "XMLIncludes.h"
 #include "Executor.h"

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

@@ -53 +53 @@
 //#include <boost/thread/thread.hpp>
 #include <boost/static_assert.hpp>
-#include "tinyxml/ticpp.h"
-#include "tinyxml/tinyxml.h"
-#include "tolua/tolua++.h"
+#include <ticpp.h>
+#include <tolua++.h>
 
 //Get around Windows hackery (windows.h is included by Ogre.h)

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

@@ -8 +8 @@
         <Tool
                 Name="VCCLCompilerTool"
-                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;"
+                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;"
                 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"
                 WarningLevel="3"