From 19aa05281e8760982ce1a9c97b7b42cb2d83749f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 17 Apr 2017 16:32:14 -0700 Subject: [PATCH] fix build errors for oven on windows --- libraries/model-baking/src/FBXBaker.cpp | 2 ++ tools/oven/CMakeLists.txt | 4 ++++ tools/oven/src/Oven.h | 2 ++ 3 files changed, 8 insertions(+) diff --git a/libraries/model-baking/src/FBXBaker.cpp b/libraries/model-baking/src/FBXBaker.cpp index fe48cc8372..e7dffea158 100644 --- a/libraries/model-baking/src/FBXBaker.cpp +++ b/libraries/model-baking/src/FBXBaker.cpp @@ -9,6 +9,8 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include // need this include so we don't get an error looking for std::isnan + #include #include diff --git a/tools/oven/CMakeLists.txt b/tools/oven/CMakeLists.txt index 1e644a2c62..c9afc7660f 100644 --- a/tools/oven/CMakeLists.txt +++ b/tools/oven/CMakeLists.txt @@ -3,3 +3,7 @@ set(TARGET_NAME oven) setup_hifi_project(Widgets Gui Concurrent) link_hifi_libraries(model-baking shared image gpu ktx) + +if (WIN32) + package_libraries_for_deployment() +endif () diff --git a/tools/oven/src/Oven.h b/tools/oven/src/Oven.h index bf7f478b83..350c615ce0 100644 --- a/tools/oven/src/Oven.h +++ b/tools/oven/src/Oven.h @@ -16,6 +16,8 @@ #include +#include + #if defined(qApp) #undef qApp #endif