Browse Source

NEWBUILD: Much of ThirdParty building

Josh Engebretson 11 years ago
parent
commit
d932e1b331
100 changed files with 761 additions and 230 deletions
  1. 22 0
      CMakeLists.txt
  2. 0 1
      Source/Atomic/.soversion
  3. 43 0
      Source/Atomic/Atomic.h
  4. 0 23
      Source/Atomic/Atomic.h.in
  5. 0 38
      Source/Atomic/Atomic.pc.in
  6. 1 1
      Source/Atomic/Audio/Audio.cpp
  7. 49 0
      Source/Atomic/CMakeLists.txt
  8. 1 1
      Source/Atomic/Core/ProcessUtils.cpp
  9. 1 1
      Source/Atomic/Graphics/OpenGL/OGLGraphicsImpl.h
  10. 1 1
      Source/Atomic/IO/FileSystem.cpp
  11. 1 1
      Source/Atomic/IO/RWOpsWrapper.h
  12. 1 1
      Source/Atomic/Input/Input.cpp
  13. 4 4
      Source/Atomic/Input/InputEvents.h
  14. 4 4
      Source/Atomic/Navigation/NavigationMesh.cpp
  15. 1 1
      Source/Atomic/Network/Connection.cpp
  16. 2 2
      Source/Atomic/Network/Connection.h
  17. 1 1
      Source/Atomic/Network/HttpRequest.cpp
  18. 1 1
      Source/Atomic/Network/Network.cpp
  19. 2 2
      Source/Atomic/Network/Network.h
  20. 13 13
      Source/Atomic/Physics/CollisionShape.cpp
  21. 5 5
      Source/Atomic/Physics/Constraint.cpp
  22. 2 2
      Source/Atomic/Physics/PhysicsUtils.h
  23. 8 8
      Source/Atomic/Physics/PhysicsWorld.cpp
  24. 1 1
      Source/Atomic/Physics/PhysicsWorld.h
  25. 3 3
      Source/Atomic/Physics/RigidBody.cpp
  26. 1 1
      Source/Atomic/Physics/RigidBody.h
  27. 1 1
      Source/Atomic/Resource/Image.cpp
  28. 1 1
      Source/Atomic/Resource/XMLElement.cpp
  29. 1 1
      Source/Atomic/Resource/XMLFile.cpp
  30. 1 1
      Source/Atomic/UI/Cursor.h
  31. 1 1
      Source/Atomic/UI/UI.cpp
  32. 1 0
      Source/Atomic/librevision.h
  33. 3 0
      Source/CMakeLists.txt
  34. 161 0
      Source/ThirdParty/Box2D/CMakeLists.txt
  35. 24 0
      Source/ThirdParty/Bullet/CMakeLists.txt
  36. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h
  37. 3 3
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
  38. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h
  39. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
  40. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h
  41. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
  42. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
  43. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h
  44. 5 5
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h
  45. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h
  46. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h
  47. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
  48. 3 3
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h
  49. 5 5
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h
  50. 3 3
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btBoxShape.h
  51. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
  52. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h
  53. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h
  54. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h
  55. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConcaveShape.h
  56. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConeShape.h
  57. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.h
  58. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
  59. 4 4
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConvexShape.h
  60. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCylinderShape.h
  61. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btOptimizedBvh.h
  62. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h
  63. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
  64. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btSphereShape.h
  65. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h
  66. 1 1
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btTriangleCallback.h
  67. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h
  68. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h
  69. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
  70. 2 2
      Source/ThirdParty/Bullet/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h
  71. 3 3
      Source/ThirdParty/Bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h
  72. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
  73. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
  74. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h
  75. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
  76. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h
  77. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
  78. 6 6
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
  79. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
  80. 4 4
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSolverBody.h
  81. 3 3
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
  82. 2 2
      Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
  83. 1 1
      Source/ThirdParty/Bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
  84. 2 2
      Source/ThirdParty/Bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h
  85. 4 4
      Source/ThirdParty/Bullet/src/BulletDynamics/Dynamics/btRigidBody.h
  86. 18 0
      Source/ThirdParty/CMakeLists.txt
  87. 10 0
      Source/ThirdParty/Civetweb/CMakeLists.txt
  88. 9 0
      Source/ThirdParty/Detour/CMakeLists.txt
  89. 9 0
      Source/ThirdParty/Duktape/CMakeLists.txt
  90. 49 0
      Source/ThirdParty/FreeType/CMakeLists.txt
  91. 5 0
      Source/ThirdParty/JO/CMakeLists.txt
  92. 6 0
      Source/ThirdParty/LZ4/CMakeLists.txt
  93. 7 0
      Source/ThirdParty/LibCpuId/CMakeLists.txt
  94. 7 0
      Source/ThirdParty/PugiXml/CMakeLists.txt
  95. 9 0
      Source/ThirdParty/Recast/CMakeLists.txt
  96. 117 0
      Source/ThirdParty/SDL/CMakeLists.txt
  97. 8 0
      Source/ThirdParty/SQLite/CMakeLists.txt
  98. 8 0
      Source/ThirdParty/STB/CMakeLists.txt
  99. 10 0
      Source/ThirdParty/StanHull/CMakeLists.txt
  100. 18 0
      Source/ThirdParty/TurboBadger/CMakeLists.txt

+ 22 - 0
CMakeLists.txt

@@ -0,0 +1,22 @@
+
+project (Atomic)
+
+cmake_minimum_required (VERSION 2.8.6)
+
+add_definitions(-DATOMIC_PHYSICS -DATOMIC_NETWORK -DATOMIC_ATOMIC2D)
+
+if (MSVC)
+
+set (CMAKE_DEBUG_POSTFIX _d)
+
+else()
+
+add_definitions(-DATOMIC_OPENGL)
+
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-offsetof -std=gnu++0x")
+
+endif()
+
+
+add_subdirectory(Source)
+

+ 0 - 1
Source/Atomic/.soversion

@@ -1 +0,0 @@
-0.0.73

+ 43 - 0
Source/Atomic/Atomic.h

@@ -0,0 +1,43 @@
+
+
+#ifndef ATOMIC_API_H
+#define ATOMIC_API_H
+
+#ifdef ATOMIC_STATIC_DEFINE
+#  define ATOMIC_API
+#  define ATOMIC_NO_EXPORT
+#else
+#  ifndef ATOMIC_API
+#    ifdef ATOMIC_EXPORTS
+        /* We are building this library */
+#      define ATOMIC_API __attribute__((visibility("default")))
+#    else
+        /* We are using this library */
+#      define ATOMIC_API __attribute__((visibility("default")))
+#    endif
+#  endif
+
+#  ifndef ATOMIC_NO_EXPORT
+#    define ATOMIC_NO_EXPORT __attribute__((visibility("hidden")))
+#  endif
+#endif
+
+#ifndef ATOMIC_DEPRECATED
+#  define ATOMIC_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#ifndef ATOMIC_DEPRECATED_EXPORT
+#  define ATOMIC_DEPRECATED_EXPORT ATOMIC_API ATOMIC_DEPRECATED
+#endif
+
+#ifndef ATOMIC_DEPRECATED_NO_EXPORT
+#  define ATOMIC_DEPRECATED_NO_EXPORT ATOMIC_NO_EXPORT ATOMIC_DEPRECATED
+#endif
+
+#define DEFINE_NO_DEPRECATED 0
+#if DEFINE_NO_DEPRECATED
+# define ATOMIC_NO_DEPRECATED
+#endif
+
+#endif
+

+ 0 - 23
Source/Atomic/Atomic.h.in

@@ -1,23 +0,0 @@
-//
-// Copyright (c) 2008-2014 the Urho3D project.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-@EXPORT_DEFINE@

+ 0 - 38
Source/Atomic/Atomic.pc.in

@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2008-2014 the Urho3D project.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/@DEST_LIBRARY_DIR@
-includedir=${prefix}/include
-
-# Additional Cflags for various build configurations, which can be accessed as normal pkg-config variable using '--variable' option
-CFLAGS_DEBUG=@CMAKE_CXX_FLAGS_DEBUG@
-CFLAGS_RELEASE=@CMAKE_CXX_FLAGS_RELEASE@
-CFLAGS_RELWITHDEBINFO=@CMAKE_CXX_FLAGS_RELWITHDEBINFO@
-
-Name: Atomic
-Description: @ATOMIC_DESCRIPTION@
-Version: @ATOMIC_VERSION@
-URL: @ATOMIC_URL@
-Libs: @CMAKE_EXE_LINKER_FLAGS@ @ATOMIC_ABS_PATH_LIBS@ @LIB_DIR@ @ATOMIC_LIBS@
-Cflags: @ATOMIC_COMPILE_DEFINITIONS@ @CMAKE_CXX_FLAGS@ @GLOBAL_INCLUDE_DIRS@ @ENGINE_INCLUDE_DIRS@

+ 1 - 1
Source/Atomic/Audio/Audio.cpp

@@ -32,7 +32,7 @@
 #include "../Audio/SoundListener.h"
 #include "../Audio/SoundListener.h"
 #include "../Audio/SoundSource3D.h"
 #include "../Audio/SoundSource3D.h"
 
 
-#include <SDL/SDL.h>
+#include <SDL/include/SDL.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 49 - 0
Source/Atomic/CMakeLists.txt

@@ -0,0 +1,49 @@
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/Source/ThirdParty
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/rapidjson/include
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/kNet/include
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/FreeType/include
+                    ${CMAKE_SOURCE_DIR}/Source/ThirdParty/Box2D)
+
+file (GLOB CONTAINER_SOURCE Container/*.cpp Container/*.h)
+file (GLOB CORE_SOURCE Core/*.cpp Core/*.h)
+file (GLOB MATH_SOURCE Math/*.cpp Math/*.h)
+file (GLOB ENGINE_SOURCE Engine/*.cpp Engine/*.h)
+file (GLOB INPUT_SOURCE Input/*.cpp Input/*.h)
+file (GLOB IO_SOURCE IO/*.cpp IO/*.h)
+file (GLOB RESOURCE_SOURCE Resource/*.cpp Resource/*.h)
+file (GLOB AUDIO_SOURCE Audio/*.cpp Audio/*.h)
+file (GLOB PHYSICS_SOURCE Physics/*.cpp Physics/*.h)
+file (GLOB NAVIGATION_SOURCE Navigation/*.cpp Navigation/*.h)
+file (GLOB NETWORK_SOURCE Network/*.cpp Network/*.h)
+file (GLOB ENVIRONMENT_SOURCE Environment/*.cpp Environment/*.h)
+file (GLOB ATOMIC2D_SOURCE Atomic2D/*.cpp Atomic2D/*.h)
+file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h)
+file (GLOB SCENE_SOURCE Scene/*.cpp Scene/*.h)
+file (GLOB UI_SOURCE UI/*.cpp UI/*.h)
+
+file (GLOB GRAPHICS_SOURCE Graphics/*.cpp Graphics/*.h)
+
+if (MSVC)
+
+else()
+
+# for kNet
+add_definitions (-DUNIX)
+
+file (GLOB GRAPHICS_IMPL_SOURCE Graphics/OpenGL/*.cpp Graphics/OpenGL/*.h)
+
+endif()
+
+
+
+set (SOURCE_FILES ${CONTAINER_SOURCE} ${CORE_SOURCE} ${ENGINE_SOURCE} ${INPUT_SOURCE}
+                  ${AUDIO_SOURCE} ${IO_SOURCE} ${MATH_SOURCE} ${NETWORK_SOURCE}
+                  ${RESOURCE_SOURCE}
+                  ${GRAPHICS_SOURCE} ${GRAPHICS_IMPL_SOURCE}
+                  ${PHYSICS_SOURCE} ${NAVIGATION_SOURCE}
+                  ${ATOMIC2D_SOURCE} ${ENVIRONMENT_SOURCE}
+                  ${JAVASCRIPT_SOURCE} ${SCENE_SOURCE} ${UI_SOURCE})
+
+add_library(Atomic ${SOURCE_FILES})
+

+ 1 - 1
Source/Atomic/Core/ProcessUtils.cpp

@@ -35,7 +35,7 @@
 #if defined(IOS)
 #if defined(IOS)
 #include <mach/mach_host.h>
 #include <mach/mach_host.h>
 #elif !defined(ANDROID) && !defined(RPI)
 #elif !defined(ANDROID) && !defined(RPI)
-#include <LibCpuId/libcpuid.h>
+#include <LibCpuId/src/libcpuid.h>
 #endif
 #endif
 
 
 #ifdef WIN32
 #ifdef WIN32

+ 1 - 1
Source/Atomic/Graphics/OpenGL/OGLGraphicsImpl.h

@@ -58,7 +58,7 @@
 #define COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8c03
 #define COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8c03
 #endif
 #endif
 
 
-#include <SDL/SDL.h>
+#include <SDL/include/SDL.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 1 - 1
Source/Atomic/IO/FileSystem.cpp

@@ -31,7 +31,7 @@
 #include "../IO/Log.h"
 #include "../IO/Log.h"
 #include "../Core/Thread.h"
 #include "../Core/Thread.h"
 
 
-#include <SDL/SDL_filesystem.h>
+#include <SDL/include/SDL_filesystem.h>
 
 
 #include <cstdio>
 #include <cstdio>
 #include <cstring>
 #include <cstring>

+ 1 - 1
Source/Atomic/IO/RWOpsWrapper.h

@@ -24,7 +24,7 @@
 
 
 #include "../IO/File.h"
 #include "../IO/File.h"
 
 
-#include <SDL/SDL_rwops.h>
+#include <SDL/include/SDL_rwops.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 1 - 1
Source/Atomic/Input/Input.cpp

@@ -40,7 +40,7 @@
 
 
 #include <cstring>
 #include <cstring>
 
 
-#include <SDL/SDL.h>
+#include <SDL/include/SDL.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 4 - 4
Source/Atomic/Input/InputEvents.h

@@ -24,10 +24,10 @@
 
 
 #include "../Core/Object.h"
 #include "../Core/Object.h"
 
 
-#include <SDL/SDL_joystick.h>
-#include <SDL/SDL_gamecontroller.h>
-#include <SDL/SDL_keycode.h>
-#include <SDL/SDL_mouse.h>
+#include <SDL/include/SDL_joystick.h>
+#include <SDL/include/SDL_gamecontroller.h>
+#include <SDL/include/SDL_keycode.h>
+#include <SDL/include/SDL_mouse.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 4 - 4
Source/Atomic/Navigation/NavigationMesh.cpp

@@ -41,10 +41,10 @@
 #include "../IO/VectorBuffer.h"
 #include "../IO/VectorBuffer.h"
 
 
 #include <cfloat>
 #include <cfloat>
-#include <Detour/DetourNavMesh.h>
-#include <Detour/DetourNavMeshBuilder.h>
-#include <Detour/DetourNavMeshQuery.h>
-#include <Recast/Recast.h>
+#include <Detour/include/DetourNavMesh.h>
+#include <Detour/include/DetourNavMeshBuilder.h>
+#include <Detour/include/DetourNavMeshQuery.h>
+#include <Recast/include/Recast.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 1 - 1
Source/Atomic/Network/Connection.cpp

@@ -38,7 +38,7 @@
 #include "../Scene/SceneEvents.h"
 #include "../Scene/SceneEvents.h"
 #include "../Scene/SmoothedTransform.h"
 #include "../Scene/SmoothedTransform.h"
 
 
-#include <kNet/kNet.h>
+#include <kNet.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 2 - 2
Source/Atomic/Network/Connection.h

@@ -29,8 +29,8 @@
 #include "../Core/Timer.h"
 #include "../Core/Timer.h"
 #include "../IO/VectorBuffer.h"
 #include "../IO/VectorBuffer.h"
 
 
-#include <kNet/kNetFwd.h>
-#include <kNet/SharedPtr.h>
+#include <kNet/include/kNetFwd.h>
+#include <kNet/include/kNet/SharedPtr.h>
 
 
 #ifdef SendMessage
 #ifdef SendMessage
 #undef SendMessage
 #undef SendMessage

+ 1 - 1
Source/Atomic/Network/HttpRequest.cpp

@@ -26,7 +26,7 @@
 #include "../Core/Profiler.h"
 #include "../Core/Profiler.h"
 #include "../Core/Timer.h"
 #include "../Core/Timer.h"
 
 
-#include <Civetweb/civetweb.h>
+#include <Civetweb/include/civetweb.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 1 - 1
Source/Atomic/Network/Network.cpp

@@ -37,7 +37,7 @@
 #include "../Network/Protocol.h"
 #include "../Network/Protocol.h"
 #include "../Scene/Scene.h"
 #include "../Scene/Scene.h"
 
 
-#include <kNet/kNet.h>
+#include <kNet.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 2 - 2
Source/Atomic/Network/Network.h

@@ -27,8 +27,8 @@
 #include "../Core/Object.h"
 #include "../Core/Object.h"
 #include "../IO/VectorBuffer.h"
 #include "../IO/VectorBuffer.h"
 
 
-#include <kNet/IMessageHandler.h>
-#include <kNet/INetworkServerListener.h>
+#include <kNet/include/kNet/IMessageHandler.h>
+#include <kNet/include/kNet/INetworkServerListener.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 13 - 13
Source/Atomic/Physics/CollisionShape.cpp

@@ -40,19 +40,19 @@
 #include "../Graphics/Terrain.h"
 #include "../Graphics/Terrain.h"
 #include "../Graphics/VertexBuffer.h"
 #include "../Graphics/VertexBuffer.h"
 
 
-#include <Bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h>
-#include <Bullet/BulletCollision/CollisionShapes/btBoxShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btCapsuleShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btCompoundShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btConeShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btConvexHullShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btCylinderShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btSphereShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h>
-#include <Bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
-#include <Bullet/BulletCollision/CollisionShapes/btStaticPlaneShape.h>
+#include <Bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btBoxShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btConeShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btCylinderShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btSphereShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h>
+#include <Bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btStaticPlaneShape.h>
 #include <StanHull/hull.h>
 #include <StanHull/hull.h>
 
 
 namespace Atomic
 namespace Atomic

+ 5 - 5
Source/Atomic/Physics/Constraint.cpp

@@ -31,11 +31,11 @@
 #include "../Physics/RigidBody.h"
 #include "../Physics/RigidBody.h"
 #include "../Scene/Scene.h"
 #include "../Scene/Scene.h"
 
 
-#include <Bullet/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h>
-#include <Bullet/BulletDynamics/ConstraintSolver/btHingeConstraint.h>
-#include <Bullet/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h>
-#include <Bullet/BulletDynamics/ConstraintSolver/btSliderConstraint.h>
-#include <Bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
+#include <Bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h>
+#include <Bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h>
+#include <Bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h>
+#include <Bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h>
+#include <Bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 2 - 2
Source/Atomic/Physics/PhysicsUtils.h

@@ -25,8 +25,8 @@
 #include "../Math/Quaternion.h"
 #include "../Math/Quaternion.h"
 #include "../Math/Vector3.h"
 #include "../Math/Vector3.h"
 
 
-#include <Bullet/LinearMath/btVector3.h>
-#include <Bullet/LinearMath/btQuaternion.h>
+#include <Bullet/src/LinearMath/btVector3.h>
+#include <Bullet/src/LinearMath/btQuaternion.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 8 - 8
Source/Atomic/Physics/PhysicsWorld.cpp

@@ -38,14 +38,14 @@
 #include "../Scene/SceneEvents.h"
 #include "../Scene/SceneEvents.h"
 #include "../Container/Sort.h"
 #include "../Container/Sort.h"
 
 
-#include <Bullet/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
-#include <Bullet/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
-#include <Bullet/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
-#include <Bullet/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h>
-#include <Bullet/BulletCollision/CollisionShapes/btBoxShape.h>
-#include <Bullet/BulletCollision/CollisionShapes/btSphereShape.h>
-#include <Bullet/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
-#include <Bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
+#include <Bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h>
+#include <Bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h>
+#include <Bullet/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h>
+#include <Bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btBoxShape.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btSphereShape.h>
+#include <Bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h>
+#include <Bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
 
 
 extern ContactAddedCallback gContactAddedCallback;
 extern ContactAddedCallback gContactAddedCallback;
 
 

+ 1 - 1
Source/Atomic/Physics/PhysicsWorld.h

@@ -29,7 +29,7 @@
 #include "../Math/Vector3.h"
 #include "../Math/Vector3.h"
 #include "../IO/VectorBuffer.h"
 #include "../IO/VectorBuffer.h"
 
 
-#include <Bullet/LinearMath/btIDebugDraw.h>
+#include <Bullet/src/LinearMath/btIDebugDraw.h>
 
 
 class btCollisionConfiguration;
 class btCollisionConfiguration;
 class btCollisionShape;
 class btCollisionShape;

+ 3 - 3
Source/Atomic/Physics/RigidBody.cpp

@@ -36,9 +36,9 @@
 #include "../Scene/SceneEvents.h"
 #include "../Scene/SceneEvents.h"
 #include "../Scene/SmoothedTransform.h"
 #include "../Scene/SmoothedTransform.h"
 
 
-#include <Bullet/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
-#include <Bullet/BulletDynamics/Dynamics/btRigidBody.h>
-#include <Bullet/BulletCollision/CollisionShapes/btCompoundShape.h>
+#include <Bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h>
+#include <Bullet/src/BulletDynamics/Dynamics/btRigidBody.h>
+#include <Bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 1 - 1
Source/Atomic/Physics/RigidBody.h

@@ -25,7 +25,7 @@
 #include "../Scene/Component.h"
 #include "../Scene/Component.h"
 #include "../IO/VectorBuffer.h"
 #include "../IO/VectorBuffer.h"
 
 
-#include <Bullet/LinearMath/btMotionState.h>
+#include <Bullet/src/LinearMath/btMotionState.h>
 
 
 class btCompoundShape;
 class btCompoundShape;
 class btRigidBody;
 class btRigidBody;

+ 1 - 1
Source/Atomic/Resource/Image.cpp

@@ -33,7 +33,7 @@
 #include <STB/stb_image.h>
 #include <STB/stb_image.h>
 #include <STB/stb_image_write.h>
 #include <STB/stb_image_write.h>
 #include <JO/jo_jpeg.h>
 #include <JO/jo_jpeg.h>
-#include <SDL/SDL_surface.h>
+#include <SDL/include/SDL_surface.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 1 - 1
Source/Atomic/Resource/XMLElement.cpp

@@ -25,7 +25,7 @@
 #include "../IO/Log.h"
 #include "../IO/Log.h"
 #include "../Resource/XMLFile.h"
 #include "../Resource/XMLFile.h"
 
 
-#include <PugiXml/pugixml.hpp>
+#include <PugiXml/src/pugixml.hpp>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 1 - 1
Source/Atomic/Resource/XMLFile.cpp

@@ -32,7 +32,7 @@
 #include "../IO/VectorBuffer.h"
 #include "../IO/VectorBuffer.h"
 #include "../Resource/XMLFile.h"
 #include "../Resource/XMLFile.h"
 
 
-#include <PugiXml/pugixml.hpp>
+#include <PugiXml/src/pugixml.hpp>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 1 - 1
Source/Atomic/UI/Cursor.h

@@ -26,7 +26,7 @@
 #include "../Resource/Image.h"
 #include "../Resource/Image.h"
 #include "../Graphics/Texture.h"
 #include "../Graphics/Texture.h"
 
 
-#include <SDL/SDL_mouse.h>
+#include <SDL/include/SDL_mouse.h>
 
 
 namespace Atomic
 namespace Atomic
 {
 {

+ 1 - 1
Source/Atomic/UI/UI.cpp

@@ -55,7 +55,7 @@
 #include "../UI/Window.h"
 #include "../UI/Window.h"
 #include "../UI/View3D.h"
 #include "../UI/View3D.h"
 
 
-#include <SDL/SDL.h>
+#include <SDL/include/SDL.h>
 
 
 #include "../DebugNew.h"
 #include "../DebugNew.h"
 
 

+ 1 - 0
Source/Atomic/librevision.h

@@ -0,0 +1 @@
+const char* revision="Unversioned";

+ 3 - 0
Source/CMakeLists.txt

@@ -0,0 +1,3 @@
+
+add_subdirectory(ThirdParty)
+add_subdirectory(Atomic)

+ 161 - 0
Source/ThirdParty/Box2D/CMakeLists.txt

@@ -0,0 +1,161 @@
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(BOX2D_Collision_SRCS
+    Box2D/Collision/b2BroadPhase.cpp
+    Box2D/Collision/b2CollideCircle.cpp
+    Box2D/Collision/b2CollideEdge.cpp
+    Box2D/Collision/b2CollidePolygon.cpp
+    Box2D/Collision/b2Collision.cpp
+    Box2D/Collision/b2Distance.cpp
+    Box2D/Collision/b2DynamicTree.cpp
+    Box2D/Collision/b2TimeOfImpact.cpp
+)
+set(BOX2D_Collision_HDRS
+    Box2D/Collision/b2BroadPhase.h
+    Box2D/Collision/b2Collision.h
+    Box2D/Collision/b2Distance.h
+    Box2D/Collision/b2DynamicTree.h
+    Box2D/Collision/b2TimeOfImpact.h
+)
+set(BOX2D_Shapes_SRCS
+    Box2D/Collision/Shapes/b2CircleShape.cpp
+    Box2D/Collision/Shapes/b2EdgeShape.cpp
+    Box2D/Collision/Shapes/b2ChainShape.cpp
+    Box2D/Collision/Shapes/b2PolygonShape.cpp
+)
+set(BOX2D_Shapes_HDRS
+    Box2D/Collision/Shapes/b2CircleShape.h
+    Box2D/Collision/Shapes/b2EdgeShape.h
+    Box2D/Collision/Shapes/b2ChainShape.h
+    Box2D/Collision/Shapes/b2PolygonShape.h
+    Box2D/Collision/Shapes/b2Shape.h
+)
+set(BOX2D_Common_SRCS
+    Box2D/Common/b2BlockAllocator.cpp
+    Box2D/Common/b2Draw.cpp
+    Box2D/Common/b2Math.cpp
+    Box2D/Common/b2Settings.cpp
+    Box2D/Common/b2StackAllocator.cpp
+    Box2D/Common/b2Timer.cpp
+)
+set(BOX2D_Common_HDRS
+    Box2D/Common/b2BlockAllocator.h
+    Box2D/Common/b2Draw.h
+    Box2D/Common/b2GrowableStack.h
+    Box2D/Common/b2Math.h
+    Box2D/Common/b2Settings.h
+    Box2D/Common/b2StackAllocator.h
+    Box2D/Common/b2Timer.h
+)
+set(BOX2D_Dynamics_SRCS
+    Box2D/Dynamics/b2Body.cpp
+    Box2D/Dynamics/b2ContactManager.cpp
+    Box2D/Dynamics/b2Fixture.cpp
+    Box2D/Dynamics/b2Island.cpp
+    Box2D/Dynamics/b2World.cpp
+    Box2D/Dynamics/b2WorldCallbacks.cpp
+)
+set(BOX2D_Dynamics_HDRS
+    Box2D/Dynamics/b2Body.h
+    Box2D/Dynamics/b2ContactManager.h
+    Box2D/Dynamics/b2Fixture.h
+    Box2D/Dynamics/b2Island.h
+    Box2D/Dynamics/b2TimeStep.h
+    Box2D/Dynamics/b2World.h
+    Box2D/Dynamics/b2WorldCallbacks.h
+)
+set(BOX2D_Contacts_SRCS
+    Box2D/Dynamics/Contacts/b2CircleContact.cpp
+    Box2D/Dynamics/Contacts/b2Contact.cpp
+    Box2D/Dynamics/Contacts/b2ContactSolver.cpp
+    Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.cpp
+    Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.cpp
+    Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.cpp
+    Box2D/Dynamics/Contacts/b2ChainAndCircleContact.cpp
+    Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.cpp
+    Box2D/Dynamics/Contacts/b2PolygonContact.cpp
+)
+set(BOX2D_Contacts_HDRS
+    Box2D/Dynamics/Contacts/b2CircleContact.h
+    Box2D/Dynamics/Contacts/b2Contact.h
+    Box2D/Dynamics/Contacts/b2ContactSolver.h
+    Box2D/Dynamics/Contacts/b2PolygonAndCircleContact.h
+    Box2D/Dynamics/Contacts/b2EdgeAndCircleContact.h
+    Box2D/Dynamics/Contacts/b2EdgeAndPolygonContact.h
+    Box2D/Dynamics/Contacts/b2ChainAndCircleContact.h
+    Box2D/Dynamics/Contacts/b2ChainAndPolygonContact.h
+    Box2D/Dynamics/Contacts/b2PolygonContact.h
+)
+set(BOX2D_Joints_SRCS
+    Box2D/Dynamics/Joints/b2DistanceJoint.cpp
+    Box2D/Dynamics/Joints/b2FrictionJoint.cpp
+    Box2D/Dynamics/Joints/b2GearJoint.cpp
+    Box2D/Dynamics/Joints/b2Joint.cpp
+    Box2D/Dynamics/Joints/b2MotorJoint.cpp
+    Box2D/Dynamics/Joints/b2MouseJoint.cpp
+    Box2D/Dynamics/Joints/b2PrismaticJoint.cpp
+    Box2D/Dynamics/Joints/b2PulleyJoint.cpp
+    Box2D/Dynamics/Joints/b2RevoluteJoint.cpp
+    Box2D/Dynamics/Joints/b2RopeJoint.cpp
+    Box2D/Dynamics/Joints/b2WeldJoint.cpp
+    Box2D/Dynamics/Joints/b2WheelJoint.cpp
+)
+set(BOX2D_Joints_HDRS
+    Box2D/Dynamics/Joints/b2DistanceJoint.h
+    Box2D/Dynamics/Joints/b2FrictionJoint.h
+    Box2D/Dynamics/Joints/b2GearJoint.h
+    Box2D/Dynamics/Joints/b2Joint.h
+    Box2D/Dynamics/Joints/b2MotorJoint.h
+    Box2D/Dynamics/Joints/b2MouseJoint.h
+    Box2D/Dynamics/Joints/b2PrismaticJoint.h
+    Box2D/Dynamics/Joints/b2PulleyJoint.h
+    Box2D/Dynamics/Joints/b2RevoluteJoint.h
+    Box2D/Dynamics/Joints/b2RopeJoint.h
+    Box2D/Dynamics/Joints/b2WeldJoint.h
+    Box2D/Dynamics/Joints/b2WheelJoint.h
+)
+set(BOX2D_Rope_SRCS
+    Box2D/Rope/b2Rope.cpp
+)
+set(BOX2D_Rope_HDRS
+    Box2D/Rope/b2Rope.h
+)
+set(BOX2D_General_HDRS
+    Box2D/Box2D.h
+)
+
+# Define source files
+file (GLOB CPP_FILES 
+    ${BOX2D_Collision_SRCS}
+    ${BOX2D_Shapes_SRCS}
+    ${BOX2D_Common_SRCS}
+    ${BOX2D_Dynamics_SRCS}
+    ${BOX2D_Contacts_SRCS}
+    ${BOX2D_Joints_SRCS}
+    ${BOX2D_Rope_SRCS})
+
+file (GLOB H_FILES 
+    ${BOX2D_Collision_HDRS}
+    ${BOX2D_Shapes_HDRS}
+    ${BOX2D_Common_HDRS}
+    ${BOX2D_Dynamics_HDRS}
+    ${BOX2D_Contacts_HDRS}
+    ${BOX2D_Joints_HDRS}
+    ${BOX2D_Rope_HDRS}
+    ${BOX2D_General_HDRS})
+
+set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
+
+# These are used to create visual studio folders.
+source_group(Collision FILES ${BOX2D_Collision_SRCS} ${BOX2D_Collision_HDRS})
+source_group(Collision\\Shapes FILES ${BOX2D_Shapes_SRCS} ${BOX2D_Shapes_HDRS})
+source_group(Common FILES ${BOX2D_Common_SRCS} ${BOX2D_Common_HDRS})
+source_group(Dynamics FILES ${BOX2D_Dynamics_SRCS} ${BOX2D_Dynamics_HDRS})
+source_group(Dynamics\\Contacts FILES ${BOX2D_Contacts_SRCS} ${BOX2D_Contacts_HDRS})
+source_group(Dynamics\\Joints FILES ${BOX2D_Joints_SRCS} ${BOX2D_Joints_HDRS})
+source_group(Include FILES ${BOX2D_General_HDRS})
+source_group(Rope FILES ${BOX2D_Rope_SRCS} ${BOX2D_Rope_HDRS})
+
+add_library(Box2D ${SOURCE_FILES})
+

+ 24 - 0
Source/ThirdParty/Bullet/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+include_directories(src)
+
+# Define source files
+file (GLOB CPP_FILES src/BulletCollision/BroadphaseCollision/*.cpp 
+    src/BulletCollision/CollisionDispatch/*.cpp src/BulletCollision/CollisionShapes/*.cpp 
+    src/BulletCollision/Gimpact/*.cpp src/BulletCollision/NarrowPhaseCollision/*.cpp 
+    src/BulletDynamics/Character/*.cpp src/BulletDynamics/ConstraintSolver/*.cpp
+    src/BulletDynamics/Dynamics/*.cpp src/BulletDynamics/Vehicle/*.cpp src/BulletSoftBody/*.cpp
+    src/BulletDynamics/Featherstone/*.cpp src/BulletDynamics/MLCPSolvers/*.cpp
+    src/LinearMath/*.cpp)
+file (GLOB H_FILES *.h src/BulletCollision/BroadphaseCollision/*.h
+    src/BulletCollision/CollisionDispatch/*.h src/BulletCollision/CollisionShapes/*.h
+    src/BulletCollision/Gimpact/*.h src/BulletCollision/NarrowPhaseCollision/*.h
+    src/BulletDynamics/Character/*.h src/BulletDynamics/ConstraintSolver/*.h
+    src/BulletDynamics/Dynamics/*.h src/BulletDynamics/Vehicle/*.h src/BulletSoftBody/*.h 
+    src/BulletDynamics/Featherstone/*.h src/BulletDynamics/MLCPSolvers/*.h
+    src/LinearMath/*.h)
+
+set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
+
+add_library(Bullet ${SOURCE_FILES})
+
+

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseInterface.h

@@ -43,7 +43,7 @@ struct	btBroadphaseRayCallback : public btBroadphaseAabbCallback
 	virtual ~btBroadphaseRayCallback() {}
 	virtual ~btBroadphaseRayCallback() {}
 };
 };
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 
 
 ///The btBroadphaseInterface class provides an interface to detect aabb-overlapping object pairs.
 ///The btBroadphaseInterface class provides an interface to detect aabb-overlapping object pairs.
 ///Some implementations for this broadphase interface include btAxisSweep3, bt32BitAxisSweep3 and btDbvtBroadphase.
 ///Some implementations for this broadphase interface include btAxisSweep3, bt32BitAxisSweep3 and btDbvtBroadphase.

+ 3 - 3
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h

@@ -16,9 +16,9 @@ subject to the following restrictions:
 #ifndef BT_BROADPHASE_PROXY_H
 #ifndef BT_BROADPHASE_PROXY_H
 #define BT_BROADPHASE_PROXY_H
 #define BT_BROADPHASE_PROXY_H
 
 
-#include "LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btScalar.h" //for SIMD_FORCE_INLINE
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btAlignedAllocator.h"
 
 
 
 
 /// btDispatcher uses these types
 /// btDispatcher uses these types

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btDbvt.h

@@ -17,10 +17,10 @@ subject to the following restrictions:
 #ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
 #ifndef BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
 #define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
 #define BT_DYNAMIC_BOUNDING_VOLUME_TREE_H
 
 
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btAabbUtil2.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btAabbUtil2.h"
 
 
 //
 //
 // Compile time configuration
 // Compile time configuration

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #ifndef BT_DBVT_BROADPHASE_H
 #ifndef BT_DBVT_BROADPHASE_H
 #define BT_DBVT_BROADPHASE_H
 #define BT_DBVT_BROADPHASE_H
 
 
-#include "BulletCollision/BroadphaseCollision/btDbvt.h"
-#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "../../BulletCollision/BroadphaseCollision/btDbvt.h"
+#include "../../BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
 
 
 //
 //
 // Compile time config
 // Compile time config

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btDispatcher.h

@@ -15,7 +15,7 @@ subject to the following restrictions:
 
 
 #ifndef BT_DISPATCHER_H
 #ifndef BT_DISPATCHER_H
 #define BT_DISPATCHER_H
 #define BT_DISPATCHER_H
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btScalar.h"
 
 
 class btCollisionAlgorithm;
 class btCollisionAlgorithm;
 struct btBroadphaseProxy;
 struct btBroadphaseProxy;

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h

@@ -21,7 +21,7 @@ subject to the following restrictions:
 #include "btBroadphaseProxy.h"
 #include "btBroadphaseProxy.h"
 #include "btOverlappingPairCallback.h"
 #include "btOverlappingPairCallback.h"
 
 
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 class btDispatcher;
 class btDispatcher;
 
 
 typedef btAlignedObjectArray<btBroadphasePair>	btBroadphasePairArray;
 typedef btAlignedObjectArray<btBroadphasePair>	btBroadphasePairArray;

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h

@@ -28,8 +28,8 @@ class btSerializer;
 #include <stdlib.h>
 #include <stdlib.h>
 #endif //DEBUG_CHECK_DEQUANTIZATION
 #endif //DEBUG_CHECK_DEQUANTIZATION
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btAlignedAllocator.h"
 
 
 #ifdef BT_USE_DOUBLE_PRECISION
 #ifdef BT_USE_DOUBLE_PRECISION
 #define btQuantizedBvhData btQuantizedBvhDoubleData
 #define btQuantizedBvhData btQuantizedBvhDoubleData
@@ -157,8 +157,8 @@ public:
 	virtual void processNode(int subPart, int triangleIndex) = 0;
 	virtual void processNode(int subPart, int triangleIndex) = 0;
 };
 };
 
 
-#include "LinearMath/btAlignedAllocator.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 
 
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionCreateFunc.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_COLLISION_CREATE_FUNC
 #ifndef BT_COLLISION_CREATE_FUNC
 #define BT_COLLISION_CREATE_FUNC
 #define BT_COLLISION_CREATE_FUNC
 
 
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 class btCollisionAlgorithm;
 class btCollisionAlgorithm;
 class btCollisionObject;
 class btCollisionObject;
 struct btCollisionObjectWrapper;
 struct btCollisionObjectWrapper;

+ 5 - 5
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionDispatcher.h

@@ -16,13 +16,13 @@ subject to the following restrictions:
 #ifndef BT_COLLISION__DISPATCHER_H
 #ifndef BT_COLLISION__DISPATCHER_H
 #define BT_COLLISION__DISPATCHER_H
 #define BT_COLLISION__DISPATCHER_H
 
 
-#include "BulletCollision/BroadphaseCollision/btDispatcher.h"
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "../../BulletCollision/BroadphaseCollision/btDispatcher.h"
+#include "../../BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 
 
-#include "BulletCollision/CollisionDispatch/btManifoldResult.h"
+#include "../../BulletCollision/CollisionDispatch/btManifoldResult.h"
 
 
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 class btIDebugDraw;
 class btIDebugDraw;
 class btOverlappingPairCache;
 class btOverlappingPairCache;

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionObject.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_COLLISION_OBJECT_H
 #ifndef BT_COLLISION_OBJECT_H
 #define BT_COLLISION_OBJECT_H
 #define BT_COLLISION_OBJECT_H
 
 
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btTransform.h"
 
 
 //island management, m_activationState1
 //island management, m_activationState1
 #define ACTIVE_TAG 1
 #define ACTIVE_TAG 1
@@ -28,9 +28,9 @@ subject to the following restrictions:
 struct	btBroadphaseProxy;
 struct	btBroadphaseProxy;
 class	btCollisionShape;
 class	btCollisionShape;
 struct btCollisionShapeData;
 struct btCollisionShapeData;
-#include "LinearMath/btMotionState.h"
-#include "LinearMath/btAlignedAllocator.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btMotionState.h"
+#include "../../LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
 typedef btAlignedObjectArray<class btCollisionObject*> btCollisionObjectArray;
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h

@@ -6,7 +6,7 @@
 class btCollisionShape;
 class btCollisionShape;
 class btCollisionObject;
 class btCollisionObject;
 class btTransform;
 class btTransform;
-#include "LinearMath/btScalar.h" // for SIMD_FORCE_INLINE definition
+#include "../../LinearMath/btScalar.h" // for SIMD_FORCE_INLINE definition
 
 
 #define BT_DECLARE_STACK_ONLY_OBJECT \
 #define BT_DECLARE_STACK_ONLY_OBJECT \
 	private: \
 	private: \

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btCollisionWorld.h

@@ -77,12 +77,12 @@ class btConvexShape;
 class btBroadphaseInterface;
 class btBroadphaseInterface;
 class btSerializer;
 class btSerializer;
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
 #include "btCollisionObject.h"
 #include "btCollisionObject.h"
 #include "btCollisionDispatcher.h"
 #include "btCollisionDispatcher.h"
-#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../BulletCollision/BroadphaseCollision/btOverlappingPairCache.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 ///CollisionWorld is interface and container for the collision detection
 ///CollisionWorld is interface and container for the collision detection
 class btCollisionWorld
 class btCollisionWorld

+ 3 - 3
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h

@@ -2,10 +2,10 @@
 #ifndef BT_INTERNAL_EDGE_UTILITY_H
 #ifndef BT_INTERNAL_EDGE_UTILITY_H
 #define BT_INTERNAL_EDGE_UTILITY_H
 #define BT_INTERNAL_EDGE_UTILITY_H
 
 
-#include "LinearMath/btHashMap.h"
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btHashMap.h"
+#include "../../LinearMath/btVector3.h"
 
 
-#include "BulletCollision/CollisionShapes/btTriangleInfoMap.h"
+#include "../../BulletCollision/CollisionShapes/btTriangleInfoMap.h"
 
 
 ///The btInternalEdgeUtility helps to avoid or reduce artifacts due to wrong collision normals caused by internal edges.
 ///The btInternalEdgeUtility helps to avoid or reduce artifacts due to wrong collision normals caused by internal edges.
 ///See also http://code.google.com/p/bullet/issues/detail?id=27
 ///See also http://code.google.com/p/bullet/issues/detail?id=27

+ 5 - 5
Source/ThirdParty/Bullet/src/BulletCollision/CollisionDispatch/btManifoldResult.h

@@ -20,14 +20,14 @@ subject to the following restrictions:
 class btCollisionObject;
 class btCollisionObject;
 struct btCollisionObjectWrapper;
 struct btCollisionObjectWrapper;
 
 
-#include "BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
+#include "../../BulletCollision/NarrowPhaseCollision/btPersistentManifold.h"
 class btManifoldPoint;
 class btManifoldPoint;
 
 
-#include "BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
+#include "../../BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h"
 
 
-#include "LinearMath/btTransform.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../BulletCollision/CollisionDispatch/btCollisionObjectWrapper.h"
+#include "../../BulletCollision/CollisionDispatch/btCollisionObject.h"
 
 
 typedef bool (*ContactAddedCallback)(btManifoldPoint& cp,	const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1);
 typedef bool (*ContactAddedCallback)(btManifoldPoint& cp,	const btCollisionObjectWrapper* colObj0Wrap,int partId0,int index0,const btCollisionObjectWrapper* colObj1Wrap,int partId1,int index1);
 extern ContactAddedCallback		gContactAddedCallback;
 extern ContactAddedCallback		gContactAddedCallback;

+ 3 - 3
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btBoxShape.h

@@ -18,9 +18,9 @@ subject to the following restrictions:
 
 
 #include "btPolyhedralConvexShape.h"
 #include "btPolyhedralConvexShape.h"
 #include "btCollisionMargin.h"
 #include "btCollisionMargin.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btMinMax.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btMinMax.h"
 
 
 ///The btBoxShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space.
 ///The btBoxShape is a box primitive around the origin, its sides axis aligned with length specified by half extents, in local shape coordinates. When used as part of a btCollisionObject or btRigidBody it will be an oriented box in world space.
 ATTRIBUTE_ALIGNED16(class) btBoxShape: public btPolyhedralConvexShape
 ATTRIBUTE_ALIGNED16(class) btBoxShape: public btPolyhedralConvexShape

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h

@@ -18,7 +18,7 @@ subject to the following restrictions:
 
 
 #include "btTriangleMeshShape.h"
 #include "btTriangleMeshShape.h"
 #include "btOptimizedBvh.h"
 #include "btOptimizedBvh.h"
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btAlignedAllocator.h"
 #include "btTriangleInfoMap.h"
 #include "btTriangleInfoMap.h"
 
 
 ///The btBvhTriangleMeshShape is a static-triangle mesh shape, it can only be used for fixed/non-moving objects.
 ///The btBvhTriangleMeshShape is a static-triangle mesh shape, it can only be used for fixed/non-moving objects.

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCapsuleShape.h

@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_CAPSULE_SHAPE_H
 #define BT_CAPSULE_SHAPE_H
 
 
 #include "btConvexInternalShape.h"
 #include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
 
 
 ///The btCapsuleShape represents a capsule around the Y axis, there is also the btCapsuleShapeX aligned around the X axis and btCapsuleShapeZ around the Z axis.
 ///The btCapsuleShape represents a capsule around the Y axis, there is also the btCapsuleShapeX aligned around the X axis and btCapsuleShapeZ around the Z axis.

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCollisionShape.h

@@ -16,10 +16,10 @@ subject to the following restrictions:
 #ifndef BT_COLLISION_SHAPE_H
 #ifndef BT_COLLISION_SHAPE_H
 #define BT_COLLISION_SHAPE_H
 #define BT_COLLISION_SHAPE_H
 
 
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btMatrix3x3.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btMatrix3x3.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" //for the shape types
 class btSerializer;
 class btSerializer;
 
 
 
 

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCompoundShape.h

@@ -18,11 +18,11 @@ subject to the following restrictions:
 
 
 #include "btCollisionShape.h"
 #include "btCollisionShape.h"
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
 #include "btCollisionMargin.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 //class btOptimizedBvh;
 //class btOptimizedBvh;
 struct btDbvt;
 struct btDbvt;

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConcaveShape.h

@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_CONCAVE_SHAPE_H
 #define BT_CONCAVE_SHAPE_H
 
 
 #include "btCollisionShape.h"
 #include "btCollisionShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 #include "btTriangleCallback.h"
 #include "btTriangleCallback.h"
 
 
 /// PHY_ScalarType enumerates possible scalar types.
 /// PHY_ScalarType enumerates possible scalar types.

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConeShape.h

@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_CONE_MINKOWSKI_H
 #define BT_CONE_MINKOWSKI_H
 
 
 #include "btConvexInternalShape.h"
 #include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
 ///The btConeShape implements a cone shape primitive, centered around the origin and aligned with the Y axis. The btConeShapeX is aligned around the X axis and btConeShapeZ around the Z axis.
 ///The btConeShape implements a cone shape primitive, centered around the origin and aligned with the Y axis. The btConeShapeX is aligned around the X axis and btConeShapeZ around the Z axis.
 ATTRIBUTE_ALIGNED16(class) btConeShape : public btConvexInternalShape
 ATTRIBUTE_ALIGNED16(class) btConeShape : public btConvexInternalShape

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConvexHullShape.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #define BT_CONVEX_HULL_SHAPE_H
 #define BT_CONVEX_HULL_SHAPE_H
 
 
 #include "btPolyhedralConvexShape.h"
 #include "btPolyhedralConvexShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 
 
 ///The btConvexHullShape implements an implicit convex hull of an array of vertices.
 ///The btConvexHullShape implements an implicit convex hull of an array of vertices.

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConvexInternalShape.h

@@ -17,7 +17,7 @@ subject to the following restrictions:
 #define BT_CONVEX_INTERNAL_SHAPE_H
 #define BT_CONVEX_INTERNAL_SHAPE_H
 
 
 #include "btConvexShape.h"
 #include "btConvexShape.h"
-#include "LinearMath/btAabbUtil2.h"
+#include "../../LinearMath/btAabbUtil2.h"
 
 
 
 
 ///The btConvexInternalShape is an internal base class, shared by most convex shape implementations.
 ///The btConvexInternalShape is an internal base class, shared by most convex shape implementations.

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btConvexShape.h

@@ -18,11 +18,11 @@ subject to the following restrictions:
 
 
 #include "btCollisionShape.h"
 #include "btCollisionShape.h"
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btCollisionMargin.h"
 #include "btCollisionMargin.h"
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btAlignedAllocator.h"
 
 
 #define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
 #define MAX_PREFERRED_PENETRATION_DIRECTIONS 10
 
 

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btCylinderShape.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #define BT_CYLINDER_MINKOWSKI_H
 #define BT_CYLINDER_MINKOWSKI_H
 
 
 #include "btBoxShape.h"
 #include "btBoxShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
-#include "LinearMath/btVector3.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../LinearMath/btVector3.h"
 
 
 /// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis.
 /// The btCylinderShape class implements a cylinder shape primitive, centered around the origin. Its central axis aligned with the Y axis. btCylinderShapeX is aligned with the X axis and btCylinderShapeZ around the Z axis.
 ATTRIBUTE_ALIGNED16(class) btCylinderShape : public btConvexInternalShape
 ATTRIBUTE_ALIGNED16(class) btCylinderShape : public btConvexInternalShape

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btOptimizedBvh.h

@@ -18,7 +18,7 @@ subject to the following restrictions:
 #ifndef BT_OPTIMIZED_BVH_H
 #ifndef BT_OPTIMIZED_BVH_H
 #define BT_OPTIMIZED_BVH_H
 #define BT_OPTIMIZED_BVH_H
 
 
-#include "BulletCollision/BroadphaseCollision/btQuantizedBvh.h"
+#include "../../BulletCollision/BroadphaseCollision/btQuantizedBvh.h"
 
 
 class btStridingMeshInterface;
 class btStridingMeshInterface;
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H
 #ifndef BT_POLYHEDRAL_CONVEX_SHAPE_H
 #define BT_POLYHEDRAL_CONVEX_SHAPE_H
 #define BT_POLYHEDRAL_CONVEX_SHAPE_H
 
 
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btConvexInternalShape.h"
 #include "btConvexInternalShape.h"
 class btConvexPolyhedron;
 class btConvexPolyhedron;
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
 #ifndef BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
 #define BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
 #define BT_SCALED_BVH_TRIANGLE_MESH_SHAPE_H
 
 
-#include "BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
+#include "../../BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h"
 
 
 
 
 ///The btScaledBvhTriangleMeshShape allows to instance a scaled version of an existing btBvhTriangleMeshShape.
 ///The btScaledBvhTriangleMeshShape allows to instance a scaled version of an existing btBvhTriangleMeshShape.

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btSphereShape.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #define BT_SPHERE_MINKOWSKI_H
 #define BT_SPHERE_MINKOWSKI_H
 
 
 #include "btConvexInternalShape.h"
 #include "btConvexInternalShape.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" // for the types
 
 
 ///The btSphereShape implements an implicit sphere, centered around a local origin with radius.
 ///The btSphereShape implements an implicit sphere, centered around a local origin with radius.
 ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexInternalShape
 ATTRIBUTE_ALIGNED16(class) btSphereShape : public btConvexInternalShape

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btStridingMeshInterface.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_STRIDING_MESHINTERFACE_H
 #ifndef BT_STRIDING_MESHINTERFACE_H
 #define BT_STRIDING_MESHINTERFACE_H
 #define BT_STRIDING_MESHINTERFACE_H
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btTriangleCallback.h"
 #include "btTriangleCallback.h"
 #include "btConcaveShape.h"
 #include "btConcaveShape.h"
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btTriangleCallback.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_TRIANGLE_CALLBACK_H
 #ifndef BT_TRIANGLE_CALLBACK_H
 #define BT_TRIANGLE_CALLBACK_H
 #define BT_TRIANGLE_CALLBACK_H
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 
 
 
 
 ///The btTriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.
 ///The btTriangleCallback provides a callback for each overlapping triangle when calling processAllTriangles.

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btTriangleIndexVertexArray.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
 #define BT_TRIANGLE_INDEX_VERTEX_ARRAY_H
 
 
 #include "btStridingMeshInterface.h"
 #include "btStridingMeshInterface.h"
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btScalar.h"
 
 
 
 
 ///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a btTriangleIndexVertexArray using addIndexedMesh.
 ///The btIndexedMesh indexes a single vertex and index array. Multiple btIndexedMesh objects can be passed into a btTriangleIndexVertexArray using addIndexedMesh.

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/CollisionShapes/btTriangleInfoMap.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #define _BT_TRIANGLE_INFO_MAP_H
 #define _BT_TRIANGLE_INFO_MAP_H
 
 
 
 
-#include "LinearMath/btHashMap.h"
-#include "LinearMath/btSerializer.h"
+#include "../../LinearMath/btHashMap.h"
+#include "../../LinearMath/btSerializer.h"
 
 
 
 
 ///for btTriangleInfo m_flags
 ///for btTriangleInfo m_flags

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h

@@ -17,8 +17,8 @@ subject to the following restrictions:
 #ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 #ifndef BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 #define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 #define BT_DISCRETE_COLLISION_DETECTOR1_INTERFACE_H
 
 
-#include "LinearMath/btTransform.h"
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
 
 
 /// This interface is made to be used by an iterative approach to do TimeOfImpact calculations
 /// This interface is made to be used by an iterative approach to do TimeOfImpact calculations
 /// This interface allows to query for closest points and penetration depth between two (convex) objects
 /// This interface allows to query for closest points and penetration depth between two (convex) objects

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h

@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef BT_MANIFOLD_CONTACT_POINT_H
 #ifndef BT_MANIFOLD_CONTACT_POINT_H
 #define BT_MANIFOLD_CONTACT_POINT_H
 #define BT_MANIFOLD_CONTACT_POINT_H
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransformUtil.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransformUtil.h"
 
 
 #ifdef PFX_USE_FREE_VECTORMATH
 #ifdef PFX_USE_FREE_VECTORMATH
 	#include "physics_effects/base_level/solver/pfx_constraint_row.h"
 	#include "physics_effects/base_level/solver/pfx_constraint_row.h"

+ 3 - 3
Source/ThirdParty/Bullet/src/BulletCollision/NarrowPhaseCollision/btPersistentManifold.h

@@ -17,11 +17,11 @@ subject to the following restrictions:
 #define BT_PERSISTENT_MANIFOLD_H
 #define BT_PERSISTENT_MANIFOLD_H
 
 
 
 
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btTransform.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btTransform.h"
 #include "btManifoldPoint.h"
 #include "btManifoldPoint.h"
 class btCollisionObject;
 class btCollisionObject;
-#include "LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btAlignedAllocator.h"
 
 
 struct btCollisionResult;
 struct btCollisionResult;
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h

@@ -36,7 +36,7 @@ and swing 1 and 2 are along the z and y axes respectively.
 #ifndef BT_CONETWISTCONSTRAINT_H
 #ifndef BT_CONETWISTCONSTRAINT_H
 #define BT_CONETWISTCONSTRAINT_H
 #define BT_CONETWISTCONSTRAINT_H
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 #include "btTypedConstraint.h"
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_CONSTRAINT_SOLVER_H
 #ifndef BT_CONSTRAINT_SOLVER_H
 #define BT_CONSTRAINT_SOLVER_H
 #define BT_CONSTRAINT_SOLVER_H
 
 
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btScalar.h"
 
 
 class btPersistentManifold;
 class btPersistentManifold;
 class btRigidBody;
 class btRigidBody;

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btContactSolverInfo.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_CONTACT_SOLVER_INFO
 #ifndef BT_CONTACT_SOLVER_INFO
 #define BT_CONTACT_SOLVER_INFO
 #define BT_CONTACT_SOLVER_INFO
 
 
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btScalar.h"
 
 
 enum	btSolverMode
 enum	btSolverMode
 {
 {

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h

@@ -21,7 +21,7 @@ subject to the following restrictions:
 #define _BT_USE_CENTER_LIMIT_ 1
 #define _BT_USE_CENTER_LIMIT_ 1
 
 
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 #include "btTypedConstraint.h"
 
 

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btJacobianEntry.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_JACOBIAN_ENTRY_H
 #ifndef BT_JACOBIAN_ENTRY_H
 #define BT_JACOBIAN_ENTRY_H
 #define BT_JACOBIAN_ENTRY_H
 
 
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btMatrix3x3.h"
 
 
 
 
 //notes:
 //notes:

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h

@@ -16,7 +16,7 @@ subject to the following restrictions:
 #ifndef BT_POINT2POINTCONSTRAINT_H
 #ifndef BT_POINT2POINTCONSTRAINT_H
 #define BT_POINT2POINTCONSTRAINT_H
 #define BT_POINT2POINTCONSTRAINT_H
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 #include "btTypedConstraint.h"
 
 

+ 6 - 6
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h

@@ -20,12 +20,12 @@ class btIDebugDraw;
 class btPersistentManifold;
 class btPersistentManifold;
 class btDispatcher;
 class btDispatcher;
 class btCollisionObject;
 class btCollisionObject;
-#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h"
-#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
-#include "BulletDynamics/ConstraintSolver/btSolverBody.h"
-#include "BulletDynamics/ConstraintSolver/btSolverConstraint.h"
-#include "BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
-#include "BulletDynamics/ConstraintSolver/btConstraintSolver.h"
+#include "../../BulletDynamics/ConstraintSolver/btTypedConstraint.h"
+#include "../../BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+#include "../../BulletDynamics/ConstraintSolver/btSolverBody.h"
+#include "../../BulletDynamics/ConstraintSolver/btSolverConstraint.h"
+#include "../../BulletCollision/NarrowPhaseCollision/btManifoldPoint.h"
+#include "../../BulletDynamics/ConstraintSolver/btConstraintSolver.h"
 
 
 ///The btSequentialImpulseConstraintSolver is a fast SIMD implementation of the Projected Gauss Seidel (iterative LCP) method.
 ///The btSequentialImpulseConstraintSolver is a fast SIMD implementation of the Projected Gauss Seidel (iterative LCP) method.
 ATTRIBUTE_ALIGNED16(class) btSequentialImpulseConstraintSolver : public btConstraintSolver
 ATTRIBUTE_ALIGNED16(class) btSequentialImpulseConstraintSolver : public btConstraintSolver

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h

@@ -33,7 +33,7 @@ TODO:
 #define btSliderConstraintDataName	"btSliderConstraintData"
 #define btSliderConstraintDataName	"btSliderConstraintData"
 #endif //BT_USE_DOUBLE_PRECISION
 #endif //BT_USE_DOUBLE_PRECISION
 
 
-#include "LinearMath/btVector3.h"
+#include "../../LinearMath/btVector3.h"
 #include "btJacobianEntry.h"
 #include "btJacobianEntry.h"
 #include "btTypedConstraint.h"
 #include "btTypedConstraint.h"
 
 

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSolverBody.h

@@ -17,11 +17,11 @@ subject to the following restrictions:
 #define BT_SOLVER_BODY_H
 #define BT_SOLVER_BODY_H
 
 
 class	btRigidBody;
 class	btRigidBody;
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btMatrix3x3.h"
 
 
-#include "LinearMath/btAlignedAllocator.h"
-#include "LinearMath/btTransformUtil.h"
+#include "../../LinearMath/btAlignedAllocator.h"
+#include "../../LinearMath/btTransformUtil.h"
 
 
 ///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
 ///Until we get other contributions, only use SIMD on Windows, when using Visual Studio 2008 or later, and not double precision
 #ifdef BT_USE_SSE
 #ifdef BT_USE_SSE

+ 3 - 3
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h

@@ -17,10 +17,10 @@ subject to the following restrictions:
 #define BT_SOLVER_CONSTRAINT_H
 #define BT_SOLVER_CONSTRAINT_H
 
 
 class	btRigidBody;
 class	btRigidBody;
-#include "LinearMath/btVector3.h"
-#include "LinearMath/btMatrix3x3.h"
+#include "../../LinearMath/btVector3.h"
+#include "../../LinearMath/btMatrix3x3.h"
 #include "btJacobianEntry.h"
 #include "btJacobianEntry.h"
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 //#define NO_FRICTION_TANGENTIALS 1
 //#define NO_FRICTION_TANGENTIALS 1
 #include "btSolverBody.h"
 #include "btSolverBody.h"

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h

@@ -17,9 +17,9 @@ subject to the following restrictions:
 #define BT_TYPED_CONSTRAINT_H
 #define BT_TYPED_CONSTRAINT_H
 
 
 
 
-#include "LinearMath/btScalar.h"
+#include "../../LinearMath/btScalar.h"
 #include "btSolverConstraint.h"
 #include "btSolverConstraint.h"
-#include "BulletDynamics/Dynamics/btRigidBody.h"
+#include "../../BulletDynamics/Dynamics/btRigidBody.h"
 
 
 #ifdef BT_USE_DOUBLE_PRECISION
 #ifdef BT_USE_DOUBLE_PRECISION
 #define btTypedConstraintData2		btTypedConstraintDoubleData
 #define btTypedConstraintData2		btTypedConstraintDoubleData

+ 1 - 1
Source/ThirdParty/Bullet/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h

@@ -29,7 +29,7 @@ class btPersistentManifold;
 class btIDebugDraw;
 class btIDebugDraw;
 struct InplaceSolverIslandCallback;
 struct InplaceSolverIslandCallback;
 
 
-#include "LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
 
 
 
 
 ///btDiscreteDynamicsWorld provides discrete rigid body simulation
 ///btDiscreteDynamicsWorld provides discrete rigid body simulation

+ 2 - 2
Source/ThirdParty/Bullet/src/BulletDynamics/Dynamics/btDynamicsWorld.h

@@ -16,8 +16,8 @@ subject to the following restrictions:
 #ifndef BT_DYNAMICS_WORLD_H
 #ifndef BT_DYNAMICS_WORLD_H
 #define BT_DYNAMICS_WORLD_H
 #define BT_DYNAMICS_WORLD_H
 
 
-#include "BulletCollision/CollisionDispatch/btCollisionWorld.h"
-#include "BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
+#include "../../BulletCollision/CollisionDispatch/btCollisionWorld.h"
+#include "../../BulletDynamics/ConstraintSolver/btContactSolverInfo.h"
 
 
 class btTypedConstraint;
 class btTypedConstraint;
 class btActionInterface;
 class btActionInterface;

+ 4 - 4
Source/ThirdParty/Bullet/src/BulletDynamics/Dynamics/btRigidBody.h

@@ -16,10 +16,10 @@ subject to the following restrictions:
 #ifndef BT_RIGIDBODY_H
 #ifndef BT_RIGIDBODY_H
 #define BT_RIGIDBODY_H
 #define BT_RIGIDBODY_H
 
 
-#include "LinearMath/btAlignedObjectArray.h"
-#include "LinearMath/btTransform.h"
-#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
-#include "BulletCollision/CollisionDispatch/btCollisionObject.h"
+#include "../../LinearMath/btAlignedObjectArray.h"
+#include "../../LinearMath/btTransform.h"
+#include "../../BulletCollision/BroadphaseCollision/btBroadphaseProxy.h"
+#include "../../BulletCollision/CollisionDispatch/btCollisionObject.h"
 
 
 class btCollisionShape;
 class btCollisionShape;
 class btMotionState;
 class btMotionState;

+ 18 - 0
Source/ThirdParty/CMakeLists.txt

@@ -0,0 +1,18 @@
+
+add_subdirectory(Box2D)
+add_subdirectory(Bullet)
+add_subdirectory(Civetweb)
+add_subdirectory(Detour)
+add_subdirectory(Duktape)
+add_subdirectory(FreeType)
+add_subdirectory(JO)
+add_subdirectory(kNet)
+add_subdirectory(LibCpuId)
+add_subdirectory(LZ4)
+add_subdirectory(PugiXml)
+add_subdirectory(Recast)
+add_subdirectory(SDL)
+add_subdirectory(SQLite)
+add_subdirectory(StanHull)
+add_subdirectory(STB)
+add_subdirectory(TurboBadger)

+ 10 - 0
Source/ThirdParty/Civetweb/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+
+include_directories(include)
+
+file (GLOB SOURCE_FILES src/*.c include/*.h)
+
+add_library(Civetweb ${SOURCE_FILES})
+
+
+

+ 9 - 0
Source/ThirdParty/Detour/CMakeLists.txt

@@ -0,0 +1,9 @@
+
+
+include_directories(include)
+
+file (GLOB SOURCE_FILES source/*.cpp include/*.h)
+
+add_library(Detour ${SOURCE_FILES})
+
+

+ 9 - 0
Source/ThirdParty/Duktape/CMakeLists.txt

@@ -0,0 +1,9 @@
+
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+# Define source files
+file (GLOB CPP_FILES *.c)
+file (GLOB H_FILES *.h)
+set (SOURCE_FILES ${CPP_FILES} ${H_FILES})
+
+add_library(Duktape ${SOURCE_FILES})

+ 49 - 0
Source/ThirdParty/FreeType/CMakeLists.txt

@@ -0,0 +1,49 @@
+
+include_directories(include)
+
+add_definitions (-DFT2_BUILD_LIBRARY)
+
+# Define source files
+set (SOURCE_FILES
+    src/autofit/autofit.c
+    src/base/ftbase.c
+    src/base/ftbbox.c
+    src/base/ftbitmap.c
+    src/base/ftfstype.c
+    src/base/ftgasp.c
+    src/base/ftglyph.c
+    src/base/ftgxval.c
+    src/base/ftinit.c
+    src/base/ftlcdfil.c
+    src/base/ftmm.c
+    src/base/ftotval.c
+    src/base/ftpatent.c
+    src/base/ftpfr.c
+    src/base/ftstroke.c
+    src/base/ftsynth.c
+    src/base/ftsystem.c
+    src/base/fttype1.c
+    src/base/ftwinfnt.c
+    src/bdf/bdf.c
+    src/bzip2/ftbzip2.c
+    src/cache/ftcache.c
+    src/cff/cff.c
+    src/cid/type1cid.c
+    src/gxvalid/gxvalid.c
+    src/gzip/ftgzip.c
+    src/lzw/ftlzw.c
+    src/otvalid/otvalid.c
+    src/pcf/pcf.c
+    src/pfr/pfr.c
+    src/psaux/psaux.c
+    src/pshinter/pshinter.c
+    src/psnames/psmodule.c
+    src/raster/raster.c
+    src/sfnt/sfnt.c
+    src/smooth/smooth.c
+    src/truetype/truetype.c
+    src/type1/type1.c
+    src/type42/type42.c
+    src/winfonts/winfnt.c)
+
+add_library(FreeType ${SOURCE_FILES})

+ 5 - 0
Source/ThirdParty/JO/CMakeLists.txt

@@ -0,0 +1,5 @@
+
+
+set (SOURCE_FILES jo_jpeg.cpp jo_jpeg.h)
+
+add_library(JO ${SOURCE_FILES})

+ 6 - 0
Source/ThirdParty/LZ4/CMakeLists.txt

@@ -0,0 +1,6 @@
+
+
+file (GLOB SOURCE_FILES *.c *.h)
+
+add_library(LZ4 ${SOURCE_FILES})
+

+ 7 - 0
Source/ThirdParty/LibCpuId/CMakeLists.txt

@@ -0,0 +1,7 @@
+
+
+include_directories(src)
+
+file (GLOB SOURCE_FILES src/*.c src/*.h)
+
+add_library(LibCpuId ${SOURCE_FILES})

+ 7 - 0
Source/ThirdParty/PugiXml/CMakeLists.txt

@@ -0,0 +1,7 @@
+set (TARGET_NAME PugiXml)
+
+file (GLOB SOURCE_FILES src/*.cpp include/*.hpp)
+
+# Setup target
+add_library(PugiXml ${SOURCE_FILES})
+

+ 9 - 0
Source/ThirdParty/Recast/CMakeLists.txt

@@ -0,0 +1,9 @@
+
+
+include_directories(include)
+
+file (GLOB SOURCE_FILES source/*.cpp include/*.h)
+
+add_library(Recast ${SOURCE_FILES})
+
+

+ 117 - 0
Source/ThirdParty/SDL/CMakeLists.txt

@@ -0,0 +1,117 @@
+
+include_directories(include)
+
+# Define source files
+file (GLOB C_FILES
+    src/*.c src/atomic/*.c src/audio/*.c src/audio/disk/*.c src/audio/dummy/*.c src/cpuinfo/*.c src/events/*.c src/file/*.c
+    src/haptic/*.c src/joystick/*.c src/libm/*.c src/power/*.c src/stdlib/*.c 
+    src/thread/*.c src/timer/*.c src/video/*.c src/video/dummy/*.c
+)
+
+if (WIN32)
+    # New MinGW versions may evaluate whether to use A or W postfix on functions before SDL gets to define UNICODE on its own,
+    # so make sure it is already defined
+    if (MINGW)
+        add_definitions (-DUNICODE=1)
+    endif ()
+    CHECK_INCLUDE_FILES (wbemcli.h HAVE_WBEMCLI_H)
+    if (HAVE_WBEMCLI_H)
+        add_definitions (-DSDL_JOYSTICK_DINPUT)
+        add_definitions (-DSDL_HAPTIC_DINPUT)
+        set (HAPTIC_DRIVER windows)
+    else ()
+        message (STATUS "Building SDL without DX joystick support due to missing wbemcli.h")
+        message (STATUS "For MSVC, get it from Windows 7 SDK. For MinGW, get it from eg. Wine sources or from MinGW-w64")
+        add_definitions (-DSDL_JOYSTICK_WINMM)
+        add_definitions (-DSDL_HAPTIC_DUMMY)
+        set (HAPTIC_DRIVER dummy)
+    endif ()
+    file (GLOB SYS_C_FILES
+        src/audio/directsound/*.c src/haptic/${HAPTIC_DRIVER}/*.c src/joystick/windows/*.c src/core/windows/*.c src/loadso/windows/*.c
+        src/power/windows/*.c src/thread/windows/*.c src/thread/generic/SDL_syscond.c src/timer/windows/*.c src/video/windows/*.c src/joystick/dummy/*.c
+        src/filesystem/windows/*.c
+    )
+elseif (IOS)
+    file (GLOB SYS_C_FILES
+        src/audio/coreaudio/*.c src/file/cocoa/*.m src/joystick/iphoneos/*.m src/loadso/dlopen/*.c src/power/uikit/*.m
+        src/thread/pthread/*.c src/timer/unix/*.c src/video/uikit/*.m src/video/uikit/*.c src/haptic/dummy/*.c
+        src/filesystem/cocoa/*.m
+    )
+elseif (APPLE)
+    file (GLOB SYS_C_FILES
+        src/audio/coreaudio/*.c src/file/cocoa/*.m src/haptic/darwin/*.c src/joystick/darwin/*.c src/loadso/dlopen/*.c
+        src/power/macosx/*.c src/thread/pthread/*.c src/timer/unix/*.c src/video/cocoa/*.m src/filesystem/cocoa/*.m
+    )
+elseif (ANDROID)
+    file (GLOB SYS_C_FILES
+        src/audio/android/*.c src/core/android/*.c src/joystick/android/*.c src/loadso/dlopen/*.c src/power/android/*.c
+        src/thread/pthread/*.c src/timer/unix/*.c src/video/android/*.c src/haptic/dummy/*.c src/filesystem/dummy/*.c
+    )
+else ()
+    # On Linux, make sure development libraries exist, and use their include file directories  
+    if (RPI)
+        file (GLOB VIDEO_DRIVER_C_FILES src/video/raspberry/*.c src/core/linux/*.c)
+    else ()
+        find_package (OpenGL REQUIRED)
+        include_directories (${OpenGL_INCLUDE_DIRS})
+        
+        find_package (X11 REQUIRED)
+        if (NOT X11_Xrandr_FOUND)
+            message (FATAL_ERROR "Could not find XRandR (libxrandr-dev)")
+        endif ()
+        include_directories (${X11_INCLUDE_DIRS})  
+
+        if (NOT DEFINED HAVE_CONST_XEXT_ADDDISPLAY)
+            message (STATUS "Following tests check whether X11 library installed in this system uses _Xconst in below functions")
+            message (STATUS "A failed test result simply means the installed X11 library does not use _Xconst")
+            message (STATUS "It is OK to proceed to build Urho3D regardless of the test result")
+        endif ()
+        include (CheckCSourceCompiles)
+        set  (CMAKE_REQUIRED_LIBRARIES ${X11_LIB} ${X11_LIB})
+        check_c_source_compiles ("
+            #include <X11/Xlib.h>
+            #include <X11/Xproto.h>
+            #include <X11/extensions/Xext.h>
+            #include <X11/extensions/extutil.h>
+            extern XExtDisplayInfo* XextAddDisplay(XExtensionInfo* a,Display* b,_Xconst char* c,XExtensionHooks* d,int e,XPointer f);
+            int main(int argc, char **argv) {}" HAVE_CONST_XEXT_ADDDISPLAY)
+        if (HAVE_CONST_XEXT_ADDDISPLAY)
+            add_definitions (-DSDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY)
+        endif ()
+        check_c_source_compiles ("
+            #include <X11/Xlibint.h>
+            extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+            int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
+        if (HAVE_CONST_XDATA32)
+            add_definitions (-DSDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
+        endif ()
+        set (CMAKE_REQUIRED_LIBRARIES)
+        
+        file (GLOB VIDEO_DRIVER_C_FILES src/video/x11/*.c)
+    endif ()
+    find_package (ALSA REQUIRED)
+    # todo: remove this fix when the minimum CMake version has been raised to higher than 2.8.7
+    # There is a bug in older version of FindALSA.cmake module where it erroneously include 'alsa' directory component into the variable
+    # For cross-compiling build to work correctly, this extra directory component must be removed
+    if (ALSA_INCLUDE_DIRS MATCHES .*/alsa)
+        get_filename_component (ALSA_INCLUDE_DIRS ${ALSA_INCLUDE_DIRS} PATH)
+    endif ()
+    # end todo
+    include_directories (${ALSA_INCLUDE_DIRS})
+
+    file (GLOB SYS_C_FILES
+        src/audio/alsa/*.c src/audio/dma/*.c src/audio/dsp/*.c src/haptic/linux/*.c src/joystick/linux/*.c src/loadso/dlopen/*.c
+        src/power/linux/*.c src/thread/pthread/*.c src/timer/unix/*.c src/filesystem/unix/*.c
+    )
+    set (SYS_C_FILES ${SYS_C_FILES} ${VIDEO_DRIVER_C_FILES})
+endif ()
+
+file (GLOB H_FILES include/*.h)
+
+# Define source files
+set_source_files_properties (${C_FILES} PROPERTIES LANGUAGE C)
+set_source_files_properties (${SYS_C_FILES} PROPERTIES LANGUAGE C)
+set (SOURCE_FILES ${C_FILES} ${SYS_C_FILES} ${H_FILES})
+
+add_library(SDL ${SOURCE_FILES})
+

+ 8 - 0
Source/ThirdParty/SQLite/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Define source files
+file (GLOB C_FILES *.c)
+file (GLOB H_FILES *.h)
+
+set (SOURCE_FILES ${C_FILES} ${H_FILES})
+
+add_library(SQLite ${SOURCE_FILES})
+

+ 8 - 0
Source/ThirdParty/STB/CMakeLists.txt

@@ -0,0 +1,8 @@
+# Define source files
+file (GLOB C_FILES *.c)
+file (GLOB H_FILES *.h)
+
+set (SOURCE_FILES ${C_FILES} ${H_FILES})
+
+add_library(STB ${SOURCE_FILES})
+

+ 10 - 0
Source/ThirdParty/StanHull/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+
+include_directories(include)
+
+file (GLOB SOURCE_FILES *.cpp *.h)
+
+add_library(StanHull ${SOURCE_FILES})
+
+
+

+ 18 - 0
Source/ThirdParty/TurboBadger/CMakeLists.txt

@@ -0,0 +1,18 @@
+
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}" ../FreeType/include ../SDL/include)
+
+if(APPLE)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-exceptions -Wall -Wextra -Wno-unused-parameter")
+    add_definitions(-DMACOSX)
+endif(APPLE)
+
+add_definitions(-DTB_FONT_RENDERER_FREETYPE)
+#add_definitions(-DTB_FONT_RENDERER_STB)
+
+# Define source files
+file (GLOB C_FILES *.cpp image/*.cpp animation/*.cpp parser/*.cpp renderers/*.cpp utf8/*.cpp)
+file (GLOB H_FILES *.h image/*.h animation/*.h parser/*.h renderers/*.h utf8/*.h)
+set (SOURCE_FILES ${C_FILES} ${H_FILES})
+
+add_library(TurboBadger ${SOURCE_FILES})
+

Some files were not shown because too many files changed in this diff