From 86be3f43dd3bc7bcfc329baeef2b803afb7501f0 Mon Sep 17 00:00:00 2001
From: Faerbit <faerbit@gmail.com>
Date: Thu, 12 Mar 2015 15:04:26 +0100
Subject: [PATCH] Changing files to account for the movement of the source
 files.

---
 CMakeLists.txt |  4 ++--
 src/level.hh   |  8 ++++----
 src/physics.cc |  1 -
 src/physics.hh | 56 +++++++++++++++++++++++++-------------------------
 src/trigger.hh |  8 ++++----
 5 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe18af0..29a75b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,11 +57,11 @@ set(dir ${CMAKE_CURRENT_SOURCE_DIR}/binaries)
 set(EXECUTABLE_OUTPUT_PATH ${dir} CACHE PATH "Build directory" FORCE)
 
 # source and header files
-FILE(GLOB SOURCE_FILES "${CMAKE_SOURCE_DIR}/*.cc")
+FILE(GLOB SOURCE_FILES "${CMAKE_SOURCE_DIR}/src/*.cc")
 FILE(GLOB SOURCE_FILES_TINYXML "${CMAKE_SOURCE_DIR}/extern/tinyxml/*.cc")
 SET(SOURCE_FILES ${SOURCE_FILES} ${SOURCE_FILES_TINYXML})
 
-FILE(GLOB HEADER_FILES "${CMAKE_SOURCE_DIR}/*.hh")
+FILE(GLOB HEADER_FILES "${CMAKE_SOURCE_DIR}/src/*.hh")
 FILE(GLOB HEADER_FILES_TINYXML "${CMAKE_SOURCE_DIR}/extern/tinyxml/*.hh")
 SET(HEADER_FILES ${HEADER_FILES} ${HEADER_FILES_TINYXML})
 
diff --git a/src/level.hh b/src/level.hh
index 60cf960..9679b42 100644
--- a/src/level.hh
+++ b/src/level.hh
@@ -13,11 +13,11 @@
 #include "skydome.hh"
 
 extern "C" {
-#include "extern/lua/src/lua.h"
-#include "extern/lua/src/lualib.h"
-#include "extern/lua/src/lauxlib.h"
+    #include "lua.h"
+    #include "lualib.h"
+    #include "lauxlib.h"
 }
-#include "extern/luabridge/LuaBridge.h"
+#include "LuaBridge.h"
 
 class Level {
     public:
diff --git a/src/physics.cc b/src/physics.cc
index d4a5014..a6daf4b 100644
--- a/src/physics.cc
+++ b/src/physics.cc
@@ -1,5 +1,4 @@
 #include "physics.hh"
-#include "extern/bullet/Extras/Serialize/BulletWorldImporter/btBulletWorldImporter.h"
 
 
 Physics::Physics() {
diff --git a/src/physics.hh b/src/physics.hh
index 3490526..3120ca3 100644
--- a/src/physics.hh
+++ b/src/physics.hh
@@ -9,40 +9,40 @@
 
 #include "entity.hh"
 
-#include "extern/bullet/src/BulletDynamics/Dynamics/btRigidBody.h"
-#include "extern/bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h"
-#include "extern/bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
+#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "BulletDynamics/Dynamics/btDynamicsWorld.h"
+#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h"
 
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btSphereShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btBoxShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btTriangleMesh.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btCylinderShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.h"
-#include "extern/bullet/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btSphereShape.h"
+#include "BulletCollision/CollisionShapes/btBoxShape.h"
+#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h"
+#include "BulletCollision/CollisionShapes/btStaticPlaneShape.h"
+#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btTriangleMesh.h"
+#include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
+#include "BulletCollision/CollisionShapes/btCylinderShape.h"
+#include "BulletCollision/CollisionShapes/btConvexHullShape.h"
+#include "BulletCollision/CollisionShapes/btConvexTriangleMeshShape.h"
 
 
-#include "extern/bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h"
-#include "extern/bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"//YAY!
-#include "extern/bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h"
+#include "BulletDynamics/ConstraintSolver/btConstraintSolver.h"
+#include "BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h"//YAY!
+#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h"
 
-#include "extern/bullet/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
-#include "extern/bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
+#include "BulletCollision/CollisionDispatch/btCollisionConfiguration.h"
+#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h"
 
-#include "extern/bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
-#include "extern/bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h"
-#include "extern/bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "BulletCollision/BroadphaseCollision/btBroadphaseInterface.h"
+#include "BulletCollision/BroadphaseCollision/btDbvtBroadphase.h"
+#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
 
-#include "extern/bullet/src/LinearMath/btScalar.h"
-#include "extern/bullet/src/LinearMath/btMotionState.h"
-#include "extern/bullet/src/LinearMath/btDefaultMotionState.h"
-#include "extern/bullet/src/LinearMath/btQuaternion.h"
-#include "extern/bullet/src/LinearMath/btVector3.h"
-#include "extern/bullet/src/LinearMath/btMatrix3x3.h"
+#include "LinearMath/btScalar.h"
+#include "LinearMath/btMotionState.h"
+#include "LinearMath/btDefaultMotionState.h"
+#include "LinearMath/btQuaternion.h"
+#include "LinearMath/btVector3.h"
+#include "LinearMath/btMatrix3x3.h"
 
 class Physics {
     public:
diff --git a/src/trigger.hh b/src/trigger.hh
index 3c30ca9..958800b 100644
--- a/src/trigger.hh
+++ b/src/trigger.hh
@@ -4,11 +4,11 @@
 #include <vector>
 #include "object.hh"
 extern "C" {
-#include "extern/lua/src/lua.h"
-#include "extern/lua/src/lualib.h"
-#include "extern/lua/src/lauxlib.h"
+    #include "lua.h"
+    #include "lualib.h"
+    #include "lauxlib.h"
 }
-#include "extern/luabridge/LuaBridge.h"
+#include "LuaBridge.h"
 
 class Level;