Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating

This commit is contained in:
Atlante45 2015-01-12 17:34:13 -08:00
commit 79b9a898de

View file

@ -9,5 +9,10 @@ include_glm()
link_hifi_libraries(animation fbx shared gpu)
if (WIN32)
# we're using static GLEW, so define GLEW_STATIC
add_definitions(-DGLEW_STATIC)
endif ()
# call macro to include our dependency includes and bubble them up via a property on our target
include_dependency_includes()