From 8dc074c0a32f22167b61d450b6d9b0216a987436 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 4 Jan 2016 15:52:06 -0800 Subject: [PATCH] fix stars file discovery without full binary dir include --- console/CMakeLists.txt | 11 +---------- interface/CMakeLists.txt | 5 ++++- interface/src/Stars.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt index 83e8d48f65..ebb8ac2f0a 100644 --- a/console/CMakeLists.txt +++ b/console/CMakeLists.txt @@ -1,17 +1,8 @@ set(TARGET_NAME package-console) -# add a target that when built will produce an executable of console for this platform -if (APPLE) - set(PACKAGE_COMMAND package-darwin) -elseif (WIN32) - set(PACKAGE_COMMAND package-win) -elseif (UNIX) - set(PACKAGE_COMMAND package-linux) -endif () - # add a target that will package the console add_custom_target(${TARGET_NAME} - COMMAND npm run-script ${PACKAGE_COMMAND} -- --out ${CMAKE_CURRENT_BINARY_DIR} + COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index adad8fc2bd..d20e7dd71f 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -125,7 +125,10 @@ link_hifi_libraries(shared octree environment gpu gl procedural model render recording fbx networking model-networking entities avatars audio audio-client animation script-engine physics render-utils entities-renderer ui auto-updater - controllers plugins display-plugins input-plugins ) + controllers plugins display-plugins input-plugins) + +# include the binary directory of render-utils for shader includes +target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries/render-utils") #fixme find a way to express faceshift as a plugin target_bullet() diff --git a/interface/src/Stars.cpp b/interface/src/Stars.cpp index c8fd5188e2..3305cc4f3b 100644 --- a/interface/src/Stars.cpp +++ b/interface/src/Stars.cpp @@ -22,11 +22,11 @@ #include #include -#include "../../libraries/render-utils/stars_vert.h" -#include "../../libraries/render-utils/stars_frag.h" +#include +#include -#include "../../libraries/render-utils/standardTransformPNTC_vert.h" -#include "../../libraries/render-utils/starsGrid_frag.h" +#include +#include //static const float TILT = 0.23f; static const float TILT = 0.0f;