ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

allow using system tinygltf library

This commit is contained in:
Maxim Cournoyer 2025-07-24 14:36:28 +09:00
parent 6f5c690a2d
commit 45a8b91364
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -657,7 +657,11 @@ add_subdirectory(Externals/glslang)
if(WIN32 OR APPLE)
add_subdirectory(Externals/spirv_cross)
endif()
add_subdirectory(Externals/tinygltf)
dolphin_find_optional_system_library(TinyGLTF Externals/tinygltf)
if(NOT DEFINED tinygltf)
add_library(tinygltf ALIAS tinygltf::tinygltf) # using system library
endif()
if(ENABLE_VULKAN)
add_definitions(-DHAS_VULKAN)

2
Externals/tinygltf/CMakeLists.txt vendored
View File

@ -7,5 +7,5 @@ if (NOT MSVC)
endif()
target_sources(tinygltf PRIVATE
tinygltf/tiny_gltf.cc)
target_include_directories(tinygltf INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(tinygltf INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/tinygltf)
dolphin_disable_warnings(tinygltf)

2
Source/Core/VideoCommon/Assets/MeshAsset.cpp
View File

@ -7,7 +7,7 @@
#include <array>
#include <utility>
#include <tinygltf/tiny_gltf.h>
#include <tiny_gltf.h>
#include "Common/IOFile.h"
#include "Common/Logging/Log.h"