Merge pull request #602 from Devsh-Graphics-Programming/master

Pull Arek's build system improvements

Author: devshgraphicsprogramming

.gitmodules

@@ -24,9 +24,6 @@
 [submodule "3rdparty/libjpeg-turbo"]
 	path = 3rdparty/libjpeg-turbo
 	url = git@github.com:Devsh-Graphics-Programming/libjpeg-turbo.git
-[submodule "3rdparty/bullet3"]
-	path = 3rdparty/bullet3
-	url = git@github.com:Devsh-Graphics-Programming/bullet3.git
 [submodule "3rdparty/portable-file-dialogs"]
 	path = 3rdparty/portable-file-dialogs
 	url = git@github.com:Devsh-Graphics-Programming/portable-file-dialogs.git

3rdparty/CMakeLists.txt

@@ -357,6 +357,7 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV-Tools-opt
 				Imath
 				OpenEXRCore
+				${NBL_BOOST_TARGETS}
 )
 if (_NBL_COMPILE_WITH_OPEN_EXR_)
 	list(APPEND NBL_3RDPARTY_TARGETS

3rdparty/boost/CMakeLists.txt

@@ -32,6 +32,16 @@ endforeach()
 
 add_subdirectory(superproject/libs/wave EXCLUDE_FROM_ALL)
 
+foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
+	if(TARGET boost_${BOOST_LIB})
+		list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
+	endif()
+endforeach()
+
+set(NBL_BOOST_TARGETS 
+	${NBL_BOOST_TARGETS}
+PARENT_SCOPE)
+
 # Boost uses it's own tool for generating dependency list for targets, therefore we 
 # can make sure manually added dependnecy subdirectories for a library are valid
 # https://www.boost.org/doc/libs/1_83_0/tools/boostdep/doc/html/index.html#boostdep.introduction.building_boostdep

3rdparty/bullet3

@@ -0,0 +1,38 @@
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2013 Erwin Coumans  http://bulletphysics.org
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef B3_BROADPHASE_CALLBACK_H
+#define B3_BROADPHASE_CALLBACK_H
+
+#include "Bullet3Common/b3Vector3.h"
+struct b3BroadphaseProxy;
+
+struct b3BroadphaseAabbCallback
+{
+	virtual ~b3BroadphaseAabbCallback() {}
+	virtual bool process(const b3BroadphaseProxy* proxy) = 0;
+};
+
+struct b3BroadphaseRayCallback : public b3BroadphaseAabbCallback
+{
+	///added some cached data to accelerate ray-AABB tests
+	b3Vector3 m_rayDirectionInverse;
+	unsigned int m_signs[3];
+	b3Scalar m_lambda_max;
+
+	virtual ~b3BroadphaseRayCallback() {}
+};
+
+#endif  //B3_BROADPHASE_CALLBACK_H