Merge branch 'bullet3ext' of https://github.com/khom-khun/IrrlichtBAW …

…into bullet

.gitmodules

@@ -41,6 +41,9 @@
 [submodule "3rdparty/libjpeg"]
 	path = 3rdparty/libjpeg
 	url = https://github.com/LuaDist/libjpeg.git
+[submodule "3rdparty/bullet3"]
+	path = 3rdparty/bullet3
+	url = https://github.com/bulletphysics/bullet3.git
 [submodule "examples_tests/media/cegui_alfisko"]
 	path = examples_tests/media/cegui_alfisko
 	url = https://gitlab.com/InnerPieceOSS/cegui_alfisko.git
@@ -55,34 +58,19 @@
 	path = 3rdparty/portable-file-dialogs
 	url = https://github.com/samhocevar/portable-file-dialogs.git
 [submodule "3rdparty/libexpat"]
-
 	path = 3rdparty/libexpat
-
 	url = https://github.com/libexpat/libexpat.git
-
 	branch = master
-
 [submodule "3rdparty/glm"]
-
 	path = 3rdparty/glm
-
 	url = https://github.com/g-truc/glm.git
-
 [submodule "3rdparty/freetype2"]
-
 	path = 3rdparty/freetype2
-
 	url = https://git.sv.nongnu.org/r/freetype/freetype2.git
-
 [submodule "3rdparty/CEGUI/pcre"]
-
 	path = 3rdparty/CEGUI/pcre
-
 	url = https://github.com/svn2github/pcre.git
-
 [submodule "3rdparty/CEGUI/glew"]
-
 	path = 3rdparty/CEGUI/glew
-
 	url = https://github.com/Perlmint/glew-cmake.git
-	branch = master
+	branch = master

3rdparty/CMakeLists.txt

@@ -259,3 +259,11 @@ if (IRR_BUILD_CEGUI)
 		CONFIGURATIONS Debug
 	)
 endif()
+
+if (IRR_BUILD_BULLET)
+	set(BULLET_INCLUDE_PATH
+		${CMAKE_CURRENT_SOURCE_DIR}/bullet3/src
+	)
+
+	set(BULLET_INCLUDE_PATH ${BULLET_INCLUDE_PATH} PARENT_SCOPE)
+endif()

CMakeLists.txt

@@ -175,6 +175,8 @@ option(IRR_BUILD_MITSUBA_LOADER "Enable irr::ext::MitsubaLoader?" ON)
 
 option(IRR_BUILD_CEGUI "Enable CEGUI building and integration?" OFF)
 
+option(IRR_BUILD_BULLET "Enable Bullet Physics building and integration?" OFF)
+
 set(THIRD_PARTY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/3rdparty")
 
 add_subdirectory(${THIRD_PARTY_SOURCE_DIR})

examples_tests/17.SimpleBulletIntegration/CMakeLists.txt

@@ -4,4 +4,9 @@ if(NOT RES)
 	message(FATAL_ERROR "common.cmake not found. Should be in {repo_root}/cmake directory")
 endif()
 
-irr_create_executable_project("" "" "" "")
+irr_create_executable_project(
+	../../ext/DebugDraw/CDraw3DLine.cpp
+	"" 
+	"${IRR_EXT_BULLET_INCLUDE_DIRS}" 
+	"${IRR_EXT_BULLET_LIB}"
+)