Skip to content

Commit

Permalink
Android.mk: .inl files shouldn't be compiled separately
Browse files Browse the repository at this point in the history
  • Loading branch information
stephengold committed Jan 18, 2025
1 parent 4135b79 commit 9331eeb
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
16 changes: 1 addition & 15 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 := \
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 0 additions & 3 deletions bash/list-cpps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit 9331eeb

Please sign in to comment.