Changeset 2610

Timestamp:

Jan 29, 2009, 9:04:27 PM (16 years ago)

Author:

rgrieder

Message:

Prefixed library directory for each internal third party library.
From now on, include for instance <tolua/tolua++> instead of <tolua++.h>
This may avoid problems if external include directories because some of our includes our modified. Consider e.g. ENet to be in /usr/include/enet/enet.h. Then you will have /usr/inlcude as include directory, possibly revealing an installed version of, say, TinyXML++.

Location:

code/branches/buildsystem2/src

Files:

• CMakeLists.txt (modified) (3 diffs)
• ceguilua/ceguilua-0.5.0/package/CEGUI.pkg (modified) (1 diff)
• ceguilua/ceguilua-0.6.0/package/CEGUI.pkg (modified) (1 diff)
• core/BaseObject.cc (modified) (1 diff)
• core/IRC.h (modified) (1 diff)
• core/Loader.cc (modified) (1 diff)
• core/LuaBind.cc (modified) (1 diff)
• core/TclBind.h (modified) (1 diff)
• core/TclThreadManager.h (modified) (1 diff)
• core/Template.cc (modified) (1 diff)
• core/Template.h (modified) (1 diff)
• core/XMLPort.h (modified) (1 diff)
• ois/CMakeLists.txt (modified) (1 diff)
• orxonox/gui/GUIManager.cc (modified) (1 diff)
• tolua/lua/package.lua (modified) (1 diff)

code/branches/buildsystem2/src/CMakeLists.txt

@@ -21 +21 @@
 
 INCLUDE_DIRECTORIES(
-  ceguilua/ceguilua-${CEGUI_VERSION}/ceguilua
-  cpptcl
-  ois
-  tinyxml
-  tolua
+  ceguilua/ceguilua-${CEGUI_VERSION}
 )
 
@@ -45 +41 @@
 
 # External libraries, but copied into the repository
+ADD_SUBDIRECTORY(tolua)
 ADD_SUBDIRECTORY(ceguilua)
 ADD_SUBDIRECTORY(cpptcl)
@@ -50 +47 @@
 ADD_SUBDIRECTORY(ois)
 ADD_SUBDIRECTORY(tinyxml)
-ADD_SUBDIRECTORY(tolua)
 
 # Our own libraries

code/branches/buildsystem2/src/ceguilua/ceguilua-0.5.0/package/CEGUI.pkg

@@ -1 +1 @@
 // include the header that makes these files generate valid code
-$#include "required.h"
+$#include "ceguilua/required.h"
 $#include "CEGUIPropertyHelper.h"
 

code/branches/buildsystem2/src/ceguilua/ceguilua-0.6.0/package/CEGUI.pkg

@@ -1 +1 @@
 // include the header that makes these files generate valid code
-$#include "required.h"
+$#include "ceguilua/required.h"
 $#include "CEGUIPropertyHelper.h"
 

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

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

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

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

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

@@ -29 +29 @@
 #include "Loader.h"
 
-#include <ticpp.h>
+#include <tinyxml/ticpp.h>
 
 #include "XMLFile.h"

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

@@ -36 +36 @@
 #include <lualib.h>
 }
-#include <tolua++.h>
+#include <tolua/tolua++.h>
 
 #include "core/ToluaBindCore.h"

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

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

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

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

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

@@ -29 +29 @@
 #include "Template.h"
 
-#include <ticpp.h>
+#include <tinyxml/ticpp.h>
 
 #include "core/CoreIncludes.h"

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

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

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

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

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

@@ -36 +36 @@
 ENDIF (WIN32)
 
+INCLUDE_DIRECTORIES(.)
+
 ADD_LIBRARY( ois_orxonox SHARED ${OIS_SRC_FILES} )
 SET_TARGET_PROPERTIES(ois_orxonox PROPERTIES DEFINE_SYMBOL "OIS_NONCLIENT_BUILD")

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

@@ -39 +39 @@
 #include <OgreRoot.h>
 #include <CEGUI.h>
-#include <CEGUILua.h>
+#include <ceguilua/CEGUILua.h>
 #include <ogreceguirenderer/OgreCEGUIRenderer.h>
 

code/branches/buildsystem2/src/tolua/lua/package.lua

@@ -121 +121 @@
 
     output('#ifndef __cplusplus\n')
-    output('#include "stdlib.h"\n')
+    output('#include <stdlib.h>\n')
     output('#endif\n')
-    output('#include "string.h"\n\n')
-    output('#include "tolua++.h"\n\n')
+    output('#include <string.h>\n\n')
+    output('#include <tolua/tolua++.h>\n\n')
 
     if flags.H then