From 9331eeb7cebd64c278d638cf3c6330775209a14e Mon Sep 17 00:00:00 2001 From: stephengold Date: Sat, 18 Jan 2025 13:56:51 -0800 Subject: [PATCH] Android.mk: .inl files shouldn't be compiled separately --- Android.mk | 16 +--------------- bash/list-cpps.sh | 3 --- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Android.mk b/Android.mk index e3e87748..7538e36b 100644 --- a/Android.mk +++ b/Android.mk @@ -15,7 +15,7 @@ LOCAL_CFLAGS := \ -Werror=return-type \ -std=c++17 -LOCAL_CPP_EXTENSION := .cpp .inl +LOCAL_CPP_EXTENSION := .cpp LOCAL_MODULE := joltjni LOCAL_SRC_FILES := \ @@ -418,20 +418,6 @@ $(N)/Jolt/TriangleSplitter/TriangleSplitterFixedLeafSize.cpp \ $(N)/Jolt/TriangleSplitter/TriangleSplitterLongestAxis.cpp \ $(N)/Jolt/TriangleSplitter/TriangleSplitterMean.cpp \ $(N)/Jolt/TriangleSplitter/TriangleSplitterMorton.cpp \ -$(N)/Jolt/Core/FixedSizeFreeList.inl \ -$(N)/Jolt/Core/JobSystem.inl \ -$(N)/Jolt/Core/LockFreeHashMap.inl \ -$(N)/Jolt/Core/Profiler.inl \ -$(N)/Jolt/Math/BVec16.inl \ -$(N)/Jolt/Math/DMat44.inl \ -$(N)/Jolt/Math/DVec3.inl \ -$(N)/Jolt/Math/Mat44.inl \ -$(N)/Jolt/Math/Quat.inl \ -$(N)/Jolt/Math/UVec4.inl \ -$(N)/Jolt/Math/Vec3.inl \ -$(N)/Jolt/Math/Vec4.inl \ -$(N)/Jolt/Physics/Body/Body.inl \ -$(N)/Jolt/Physics/Body/MotionProperties.inl \ $(N)/TestFramework/External/Perlin.cpp include $(BUILD_SHARED_LIBRARY) diff --git a/bash/list-cpps.sh b/bash/list-cpps.sh index e7fcbe3a..27061095 100755 --- a/bash/list-cpps.sh +++ b/bash/list-cpps.sh @@ -6,7 +6,4 @@ /usr/bin/find ./src/main/native/Jolt -name '*.cpp' -printf '$(N)/Jolt/%P \\\n' \ | /usr/bin/sort -/usr/bin/find ./src/main/native -name '*.inl' -printf '$(N)/%P \\\n' \ -| /usr/bin/sort - echo '$(N)/TestFramework/External/Perlin.cpp'