Skip to content

Commit

Permalink
CMake: avoid inclusion of compat/malloc on Android
Browse files Browse the repository at this point in the history
Android NDK has its own malloc.h.
This commit fixes build on Android NDK and Termux.
See the similar upstream issue android/ndk#738
for details.
  • Loading branch information
Gitea committed Nov 5, 2023
1 parent ba68f97 commit 9045dda
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function(tv_add_private_includes target)
"${PROJECT_SOURCE_DIR}/include/tvision/compat/windows"
)
endif()
if (NOT WIN32 AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
if (NOT WIN32 AND NOT (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android"))
target_include_directories(${target} PRIVATE
"${PROJECT_SOURCE_DIR}/include/tvision/compat/malloc"
)
Expand Down

0 comments on commit 9045dda

Please sign in to comment.