Mirrors/tinyusdz
0
0
Fork 0
mirror of https://github.com/lighttransport/tinyusdz.git synced 2026-01-18 01:11:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix android build.

Browse Source
This commit is contained in:
Syoyo Fujita
2022-01-28 03:24:04 +09:00
parent aef0423616
commit 828b98fe58
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/cpp/CMakeLists.txt
View File

@@ -12,6 +12,7 @@ set(TINYUSDZ_SOURCES
if (TINYUSDZ_USE_USDOBJ)
list(APPEND TINYUSDZ_SOURCES ${PROJECT_SOURCE_DIR}/../../../../../src/usdObj.cc)
list(APPEND TINYUSDZ_SOURCES ${PROJECT_SOURCE_DIR}/../../../../../src/external/tiny_obj_loader.cc)
endif()
@@ -19,6 +20,7 @@ set(TINYUSDZ_DEP_SOURCES
${PROJECT_SOURCE_DIR}/../../../../../src/integerCoding.cpp
${PROJECT_SOURCE_DIR}/../../../../../src/lz4-compression.cc
${PROJECT_SOURCE_DIR}/../../../../../src/pxrLZ4/lz4.cpp
${PROJECT_SOURCE_DIR}/../../../../../src/external/fpng.cpp
${PROJECT_SOURCE_DIR}/../../../../../src/external/ryu/ryu/s2d.c
${PROJECT_SOURCE_DIR}/../../../../../src/external/ryu/ryu/s2f.c
)

4
src/external/fpng.cpp vendored
View File

@@ -17,6 +17,10 @@
#include <assert.h>
#include <string.h>
#ifdef __clang__
#pragma clang diagnostic ignored "-Weverything"
#endif
#ifdef _MSC_VER
#pragma warning (disable:4127) // conditional expression is constant
#endif