@@ -442,7 +442,7 @@ AC_CONFIG_FILES( | |||||
people/peeweek/private/Makefile | people/peeweek/private/Makefile | ||||
people/touky/Makefile | people/touky/Makefile | ||||
people/touky/private/Makefile | people/touky/private/Makefile | ||||
people/touky/private/Tactics/Makefile | |||||
people/touky/private/tactics/Makefile | |||||
people/jylam/Makefile | people/jylam/Makefile | ||||
people/jylam/private/Makefile | people/jylam/private/Makefile | ||||
people/jylam/private/chat/Makefile | people/jylam/private/chat/Makefile | ||||
@@ -33,8 +33,8 @@ using namespace lol; | |||||
#define HAVE_PHYS_USE_BULLET | #define HAVE_PHYS_USE_BULLET | ||||
#endif /* HAVE_PHYS_USE_BULLET */ | #endif /* HAVE_PHYS_USE_BULLET */ | ||||
#include "physics/include/lolphysics.h" | |||||
#include "physics/include/easyphysics.h" | |||||
#include "physics/lolphysics.h" | |||||
#include "physics/easyphysics.h" | |||||
#include "physicobject.h" | #include "physicobject.h" | ||||
#include "btphystest.h" | #include "btphystest.h" | ||||
@@ -13,9 +13,9 @@ | |||||
#include "core.h" | #include "core.h" | ||||
#include "easymesh/easymesh.h" | #include "easymesh/easymesh.h" | ||||
#include "physics/include/easyphysics.h" | |||||
#include "physics/include/easycharactercontroller.h" | |||||
#include "physics/include/easyconstraint.h" | |||||
#include "physics/easyphysics.h" | |||||
#include "physics/easycharactercontroller.h" | |||||
#include "physics/easyconstraint.h" | |||||
using namespace lol; | using namespace lol; | ||||
using namespace lol::phys; | using namespace lol::phys; | ||||
@@ -19,10 +19,10 @@ | |||||
#ifdef HAVE_PHYS_USE_BULLET | #ifdef HAVE_PHYS_USE_BULLET | ||||
#include "core.h" | #include "core.h" | ||||
#include <stdio.h> | #include <stdio.h> | ||||
#include "../include/lolbtphysicsintegration.h" | |||||
#include "../include/lolphysics.h" | |||||
#include "../include/easycharactercontroller.h" | |||||
#include "../include/bulletcharactercontroller.h" | |||||
#include "lolbtphysicsintegration.h" | |||||
#include "lolphysics.h" | |||||
#include "easycharactercontroller.h" | |||||
#include "bulletcharactercontroller.h" | |||||
//#include "LinearMath/btIDebugDraw.h" | //#include "LinearMath/btIDebugDraw.h" | ||||
//#include "BulletCollision/CollisionDispatch/btGhostObject.h" | //#include "BulletCollision/CollisionDispatch/btGhostObject.h" | ||||
//#include "BulletCollision/CollisionShapes/btMultiSphereShape.h" | //#include "BulletCollision/CollisionShapes/btMultiSphereShape.h" | ||||
@@ -14,9 +14,9 @@ | |||||
# include "config.h" | # include "config.h" | ||||
#endif | #endif | ||||
#include "../include/lolbtphysicsintegration.h" | |||||
#include "../include/lolphysics.h" | |||||
#include "../include/easycharactercontroller.h" | |||||
#include "lolbtphysicsintegration.h" | |||||
#include "lolphysics.h" | |||||
#include "easycharactercontroller.h" | |||||
namespace lol | namespace lol | ||||
{ | { | ||||
@@ -3,9 +3,9 @@ | |||||
# include "config.h" | # include "config.h" | ||||
#endif | #endif | ||||
#include "../include/lolbtphysicsintegration.h" | |||||
#include "../include/lolphysics.h" | |||||
#include "../include/easyconstraint.h" | |||||
#include "lolbtphysicsintegration.h" | |||||
#include "lolphysics.h" | |||||
#include "easyconstraint.h" | |||||
namespace lol | namespace lol | ||||
{ | { | ||||
@@ -14,8 +14,8 @@ | |||||
# include "config.h" | # include "config.h" | ||||
#endif | #endif | ||||
#include "../include/lolbtphysicsintegration.h" | |||||
#include "../include/lolphysics.h" | |||||
#include "lolbtphysicsintegration.h" | |||||
#include "lolphysics.h" | |||||
namespace lol | namespace lol | ||||
{ | { | ||||