diff --git a/examples/glview/CMakeLists.txt b/examples/glview/CMakeLists.txt index 982bb6c..a91dc14 100644 --- a/examples/glview/CMakeLists.txt +++ b/examples/glview/CMakeLists.txt @@ -45,6 +45,7 @@ include_directories( add_executable(glview glview.cc + ../../json11.cpp ../common/trackball.cc ) diff --git a/examples/glview/glview.cc b/examples/glview/glview.cc index b2a3d70..0274594 100644 --- a/examples/glview/glview.cc +++ b/examples/glview/glview.cc @@ -678,13 +678,13 @@ static void DrawNode(tinygltf::Model &model, const tinygltf::Node &node) { // FIXME(syoyo): Refactor. // DrawCurves(scene, it->second); if (node.mesh > -1) { - assert(node.mesh < model.meshes.size()); + assert(node.mesh < int(model.meshes.size())); DrawMesh(model, model.meshes[node.mesh]); } // Draw child nodes. for (size_t i = 0; i < node.children.size(); i++) { - assert(node.children[i] < model.nodes.size()); + assert(node.children[i] < int(model.nodes.size())); DrawNode(model, model.nodes[node.children[i]]); } diff --git a/examples/glview/premake5.lua b/examples/glview/premake5.lua index 938d008..fd04ab9 100644 --- a/examples/glview/premake5.lua +++ b/examples/glview/premake5.lua @@ -8,7 +8,7 @@ solution "glview" kind "ConsoleApp" language "C++" cppdialect "C++11" - files { "glview.cc", "../common/trackball.cc" } + files { "glview.cc", "../../json11.cpp", "../common/trackball.cc" } includedirs { "./" } includedirs { "../../" } includedirs { "../common/" }