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

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

Browse source
This commit is contained in:
Andrzej Kapolka 2014-03-11 15:11:32 -07:00
commit 3d9d89e4a7
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/CMakeLists.txt
View file

@ -139,7 +139,8 @@ if (VISAGE_FOUND AND NOT DISABLE_VISAGE)
include_directories(SYSTEM "${VISAGE_INCLUDE_DIRS}") include_directories(SYSTEM "${VISAGE_INCLUDE_DIRS}")
if (APPLE) if (APPLE)
add_definitions(-DMAC_OS_X) add_definitions(-DMAC_OS_X)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment -isystem ${VISAGE_INCLUDE_DIRS}") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-comment")
include_directories(SYSTEM "${VISAGE_INCLUDE_DIRS}")
find_library(AVFoundation AVFoundation) find_library(AVFoundation AVFoundation)
find_library(CoreMedia CoreMedia) find_library(CoreMedia CoreMedia)
find_library(NEW_STD_LIBRARY libc++.dylib /usr/lib/) find_library(NEW_STD_LIBRARY libc++.dylib /usr/lib/)

1
interface/src/devices/Visage.cpp
View file

@ -14,6 +14,7 @@
#include <VisageTracker2.h> #include <VisageTracker2.h>
#endif #endif
#include "Application.h"
#include "Visage.h" #include "Visage.h"
#include "renderer/FBXReader.h" #include "renderer/FBXReader.h"