GitHub-Proxy/tinygltf
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/syoyo/tinygltf.git synced 2025-09-23 18:03:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update json.hpp to fix compilation with clang with C++17(-std=c++1z) support.

Browse Source
This commit is contained in:
Syoyo Fujita 2019-02-04 16:19:13 +09:00
parent ead876fce9
commit c0d0251e2c
2 changed files with 9093 additions and 3407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/glview/CMakeLists.txt
View File

@ -23,15 +23,17 @@ endif (APPLE)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
if (${DRACO_DIR} STREQUAL "") if (DEFINED DRACO_DIR)
else () if (DRACO_DIR STREQUAL "")
# TODO(syoyo): better CMake script for draco else ()
add_definitions(-DTINYGLTF_ENABLE_DRACO) # TODO(syoyo): better CMake script for draco
include_directories(${DRACO_DIR}/include) add_definitions(-DTINYGLTF_ENABLE_DRACO)
include_directories(${DRACO_DIR}/include)
link_directories(${DRACO_DIR}/lib) link_directories(${DRACO_DIR}/lib)
set(DRACO_LIBRARY draco) set(DRACO_LIBRARY draco)
endif () endif ()
endif()
include_directories( include_directories(
../../ ../../

12480
json.hpp
View File

File diff suppressed because it is too large Load Diff