diff options
| author | Juan Ramos <juan@lunarg.com> | 2023-07-18 11:50:19 -0600 |
|---|---|---|
| committer | arcady-lunarg <122813703+arcady-lunarg@users.noreply.github.com> | 2023-07-18 13:08:33 -0600 |
| commit | a9a262541601fd08cc30a9a449dc7fba82303980 (patch) | |
| tree | c89d64e2618859cb59a35d296a225b9f645221c8 | |
| parent | 9afd3461272fb318669774b2999d88c90cc9dabc (diff) | |
| download | glslang-a9a262541601fd08cc30a9a449dc7fba82303980.tar.gz | |
cmake: Fix Android build for r25 NDK
Currently with the build instructions provided in README.md
the build will fail.
In the r25 NDK the CMake toolchain defaults to the legacy path,
due to a bug in the current implementation.
https://github.com/android/ndk/issues/323
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | glslang/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 89ecf64c..d6613bf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ if(WIN32) include(ChooseMSVCCRT.cmake) endif() add_definitions(-DGLSLANG_OSINCLUDE_WIN32) -elseif(UNIX) +elseif(UNIX OR ANDROID) add_definitions(-DGLSLANG_OSINCLUDE_UNIX) else() message("unknown platform") diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt index 317eee77..f9ba5ebc 100644 --- a/glslang/CMakeLists.txt +++ b/glslang/CMakeLists.txt @@ -33,7 +33,7 @@ if(WIN32) add_subdirectory(OSDependent/Windows) -elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia") +elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia" OR ANDROID) add_subdirectory(OSDependent/Unix) else() message("unknown platform") |