Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 00:47:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix stars file discovery without full binary dir include

Browse source
This commit is contained in:
Stephen Birarda 2016-01-04 15:52:06 -08:00
parent 508a5c74a2
commit 8dc074c0a3
3 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
console/CMakeLists.txt
View file

@ -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}
)

5
interface/CMakeLists.txt
View file

@ -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()

8
interface/src/Stars.cpp
View file

@ -22,11 +22,11 @@
#include <RenderArgs.h>
#include <ViewFrustum.h>
#include "../../libraries/render-utils/stars_vert.h"
#include "../../libraries/render-utils/stars_frag.h"
#include <stars_vert.h>
#include <stars_frag.h>
#include "../../libraries/render-utils/standardTransformPNTC_vert.h"
#include "../../libraries/render-utils/starsGrid_frag.h"
#include <standardTransformPNTC_vert.h>
#include <starsGrid_frag.h>
//static const float TILT = 0.23f;
static const float TILT = 0.0f;