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

Merge branch 'master' of https://github.com/worklist/hifi into gyroquat

Browse source
This commit is contained in:
Andrzej Kapolka 2013-06-07 13:46:27 -07:00
commit 5515fc02e4
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/CMakeLists.txt
View file

@ -87,13 +87,19 @@ find_package(GLM REQUIRED)
find_package(LodePNG REQUIRED) find_package(LodePNG REQUIRED)
find_package(LibOVR) find_package(LibOVR)
# include headers for external libraries and InterfaceConfig. # include headers for interface and InterfaceConfig.
include_directories( include_directories(
${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/src
${PROJECT_BINARY_DIR}/includes ${PROJECT_BINARY_DIR}/includes
${GLM_INCLUDE_DIRS} )
${LODEPNG_INCLUDE_DIRS}
${LIBOVR_INCLUDE_DIRS} # include external library headers
# use system flag so warnings are supressed
include_directories(
SYSTEM
${GLM_INCLUDE_DIRS}
${LODEPNG_INCLUDE_DIRS}
${LIBOVR_INCLUDE_DIRS}
) )
target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES}) target_link_libraries(${TARGET_NAME} ${QT_LIBRARIES})

2
interface/src/main.cpp
View file

@ -18,8 +18,6 @@
#include "Application.h" #include "Application.h"
#include "Log.h" #include "Log.h"
#include <OctalCode.h>
int main(int argc, const char * argv[]) { int main(int argc, const char * argv[]) {
timeval startup_time; timeval startup_time;
gettimeofday(&startup_time, NULL); gettimeofday(&startup_time, NULL);