bullet3 replaced with reactphysics3d, redownload windev/droidev

SConstruct

@@ -73,7 +73,7 @@ if "version.cpp" in sources: sources.remove("version.cpp")
 env.Command(target = "src/version.cpp", source = ["src/" + i for i in sources], action = env["generate_version"])
 version_object = env.Object("build/obj_src/version", "src/version.cpp") # Things get weird if we do this after VariantDir.
 VariantDir("build/obj_src", "src", duplicate = 0)
-env.Append(LIBS = [["PocoFoundationMT", "PocoJSONMT", "PocoNetMT", "PocoNetSSLWinMT", "PocoUtilMT", "PocoZipMT"] if env["PLATFORM"] == "win32" else ["PocoJSON", "PocoNet", "PocoNetSSL", "PocoUtil", "PocoCrypto", "PocoZip", "PocoFoundation"], "phonon", "bass", "bass_fx", "bassmix"])
+env.Append(LIBS = [["PocoFoundationMT", "PocoJSONMT", "PocoNetMT", "PocoNetSSLWinMT", "PocoUtilMT", "PocoZipMT"] if env["PLATFORM"] == "win32" else ["PocoJSON", "PocoNet", "PocoNetSSL", "PocoUtil", "PocoCrypto", "PocoZip", "PocoFoundation"], "phonon", "bass", "bass_fx", "bassmix", "reactphysics3d"])
 env.Append(CPPDEFINES = ["NVGT_BUILDING", "NO_OBFUSCATE"], LIBS = ["ASAddon", "deps"])
 if env["PLATFORM"] == "win32":
 	env.Append(LINKFLAGS = ["/OPT:REF", "/OPT:ICF", "/ignore:4099", "/delayload:bass.dll", "/delayload:bass_fx.dll", "/delayload:bassmix.dll", "/delayload:phonon.dll"])

build/build_linux.sh

@@ -11,13 +11,14 @@ function setup_angelscript {
 	echo Angelscript installed.
 }
 
-function setup_bullet {
-	echo Installing bullet3...
-	sudo apt install python3-dev -y
-	git clone --depth 1 https://github.com/bulletphysics/bullet3||true
-	cd bullet3
-	./build_cmake_pybullet_double.sh
+function setup_reactphysics {
+	echo Installing reactphysics3d...
+	git clone --depth 1 https://github.com/DanielChappuis/reactphysics3d||true
+	cd reactphysics3d
+	mkdir build_cmake
 	cd build_cmake
+	cmake -S.. -B. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
+	cmake --build . --config MinSizeRel -j$(nproc)
 	sudo cmake --install .
 	cd ../..
 }
@@ -42,7 +43,7 @@ function setup_libgit2 {
 	mkdir -p build
 	cd build
 	cmake .. -DBUILD_TESTS=OFF -DUSE_ICONV=OFF -DBUILD_CLI=OFF -DCMAKE_BUILD_TYPE=Release
-	cmake --build .
+	cmake --build . -j$(nproc)
 	sudo cmake --install .
 	cd ../..
 	rm v1.8.1.tar.gz
@@ -55,7 +56,7 @@ function setup_libplist {
 	tar -xf libplist-2.6.0.tar.bz2
 	cd libplist-2.6.0
 	./configure --without-cython
-	make
+	make -j$(nproc)
 	sudo make install
 	cd ..
 	rm libplist-2.6.0.tar.bz2
@@ -72,7 +73,7 @@ function setup_poco {
 	export CFLAGS="-fPIC -DPOCO_UTIL_NO_XMLCONFIGURATION"
 	export CXXFLAGS="-fPIC -DPOCO_UTIL_NO_XMLCONFIGURATION"
 	cmake .. -DENABLE_TESTS=OFF -DENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=MinSizeRel -DENABLE_PAGECOMPILER=OFF -DENABLE_PAGECOMPILER_FILE2PAGE=OFF -DENABLE_ACTIVERECORD=OFF -DENABLE_ACTIVERECORD_COMPILER=OFF -DENABLE_MONGODB=OFF -DBUILD_SHARED_LIBS=OFF
-	cmake --build .
+	cmake --build . -j$(nproc)
 	sudo cmake --install .
 	cd ../..
 	rm poco-1.13.3-all.tar.gz
@@ -89,7 +90,7 @@ function setup_sdl {
 	cd SDL/build
 	git checkout 4e09e58f62e95a66125dae9ddd3e302603819ffd
 	cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DSDL_SHARED=OFF -DSDL_STATIC=ON -DSDL_TEST_LIBRARY=OFF ..
-	cmake --build . --config MinSizeRel
+	cmake --build . --config MinSizeRel -j$(nproc)
 	sudo make install
 	cd ../..
 	echo SDL installed.
@@ -136,7 +137,7 @@ function main {
 	sudo apt install build-essential gcc g++ make cmake autoconf libtool python3 python3-pip libsystemd-dev libspeechd-dev -y
 
 	setup_angelscript
-	setup_bullet
+	setup_reactphysics
 	setup_enet
 	setup_libgit2
 	setup_libplist

build/build_macos.sh

@@ -35,20 +35,20 @@ function setup_angelscript {
 	mkdir -p build
 	cd build
 	cmake .. -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-	cmake --build .
+	cmake --build . -j$(nsysctl -n hw.ncpu)
 	sudo cmake --install .
 	cd ../../../../../..
 	echo Angelscript installed.
 }
 
-function setup_bullet {
-	echo Installing bullet3...
-	git clone --depth 1 https://github.com/bulletphysics/bullet3||true
-	cd bullet3
+function setup_reactphysics {
+	echo Installing reactphysics3d...
+	git clone --depth 1 https://github.com/DanielChappuis/reactphysics3d||true
+	cd reactphysics3d
 	mkdir build_cmake
 	cd build_cmake
-	cmake -S.. -B. -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=MinSizeRel -DBUILD_UNIT_TESTS=OFF -DBUILD_CPU_DEMOS=OFF -DBUILD_ENET=OFF -DBUILD_CLSOCKET=OFF -DBUILD_EGL=OFF -DBUILD_OPENGL3_DEMOS=OFF -DBUILD_BULLET2_DEMOS=OFF -DBUILD_EXTRAS=OFF -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-	cmake --build .
+	cmake -S.. -B. -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
+	cmake --build . --config MinSizeRel -j$(nsysctl -n hw.ncpu)
 	sudo cmake --install .
 	cd ../..
 }
@@ -72,7 +72,7 @@ function setup_libgit2 {
 	mkdir -p build
 	cd build
 	cmake .. -DBUILD_TESTS=OFF -DUSE_ICONV=OFF -DBUILD_CLI=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64"
-	cmake --build .
+	cmake --build . -j$(nsysctl -n hw.ncpu)
 	sudo cmake --install .
 	cd ../..
 	rm v1.8.1.tar.gz
@@ -84,7 +84,7 @@ function setup_libplist {
 	tar -xf libplist-2.6.0.tar.bz2
 	cd libplist-2.6.0
 	./configure --without-cython CC="clang -arch x86_64 -arch arm64" CXX="clang++ -arch x86_64 -arch arm64" CPP="clang -E" CXXCPP="clang++ -E"
-	make
+	make -j$(nsysctl -n hw.ncpu)
 	sudo make install
 	cd ..
 	rm libplist-2.6.0.tar.bz2
@@ -98,7 +98,7 @@ function setup_poco {
 	mkdir -p cmake_build
 	cd cmake_build
 	cmake .. -DENABLE_TESTS=OFF -DENABLE_SAMPLES=OFF -DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" -DENABLE_PAGECOMPILER=OFF -DENABLE_PAGECOMPILER_FILE2PAGE=OFF -DENABLE_ACTIVERECORD=OFF -DENABLE_ACTIVERECORD_COMPILER=OFF -DENABLE_MONGODB=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS=-DPOCO_UTIL_NO_XMLCONFIGURATION
-	cmake --build .
+	cmake --build . -j$(nsysctl -n hw.ncpu)
 	sudo cmake --install .
 	cd ../..
 	rm poco-1.13.3-all.tar.gz
@@ -111,7 +111,7 @@ function setup_sdl {
 	cd SDL/build
 	git checkout 4e09e58f62e95a66125dae9ddd3e302603819ffd
 	cmake -DCMAKE_BUILD_TYPE=MinSizeRel -DSDL_SHARED=OFF -DSDL_STATIC=ON -DSDL_TEST_LIBRARY=OFF -DCMAKE_OSX_ARCHITECTURES="arm64;x86_64" ..
-	cmake --build . --config MinSizeRel
+	cmake --build . --config MinSizeRel -j$(nsysctl -n hw.ncpu)
 	sudo make install
 	cd ../..
 	echo SDL installed.
@@ -150,7 +150,7 @@ function main {
 	setup_homebrew
 	setup_openssl
 	setup_angelscript
-	setup_bullet
+	setup_reactphysics
 	setup_enet
 	setup_libgit2
 	setup_poco

jni/Android.mk

@@ -54,6 +54,10 @@ LOCAL_MODULE    := libenet
 LOCAL_SRC_FILES := $(LIBPATH)/libenet.a
 include $(PREBUILT_STATIC_LIBRARY)
 
+LOCAL_MODULE    := libreactphysics3d
+LOCAL_SRC_FILES := $(LIBPATH)/libreactphysics3d.a
+include $(PREBUILT_STATIC_LIBRARY)
+
 LOCAL_MODULE    := libssl
 LOCAL_SRC_FILES := $(LIBPATH)/libssl.a
 include $(PREBUILT_STATIC_LIBRARY)
@@ -96,7 +100,7 @@ LOCAL_C_INCLUDES_COMMON := $(LOCAL_PATH)/../droidev/include $(LOCAL_PATH)/../ASA
 LOCAL_CXXFLAGS_COMMON := -DPOCO_STATIC -DNVGT_BUILDING -DAS_USE_STLNAMES=1 -std=c++20 -fms-extensions -ffunction-sections -O2 -fpermissive -O2 -Wno-narrowing -Wno-int-to-pointer-cast -Wno-delete-incomplete -Wno-unused-result -Wno-deprecated-array-compare -Wno-implicit-const-int-float-conversion
 LOCAL_LDFLAGS_COMMON = -Wl,--no-fatal-warnings -Wl,--no-undefined -Wl,--gc-sections
 LOCAL_SHARED_LIBRARIES_COMMON := SDL3 bass bassmix bass_fx phonon
-LOCAL_STATIC_LIBRARIES_COMMON := libPocoFoundation libPocoCrypto libPocoDataSQLite libPocoJSON libPocoNet libPocoNetSSL libPocoUtil libPocoXML libPocoZip libangelscript libcrypto libenet libssl
+LOCAL_STATIC_LIBRARIES_COMMON := libPocoFoundation libPocoCrypto libPocoDataSQLite libPocoJSON libPocoNet libPocoNetSSL libPocoUtil libPocoXML libPocoZip libangelscript libcrypto libenet libreactphysics3d libssl
 LOCAL_LDLIBS_COMMON := -lGLESv1_CM -lGLESv2 -lOpenSLES -llog -landroid
 LOCAL_CPP_FEATURES_COMMON := rtti exceptions