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

fix ordering and includes for oculusmanager and 3dtv

Browse source
This commit is contained in:
Brad Hefta-Gaub 2014-01-13 10:11:08 -08:00
parent 98efbade9b
commit 3f03145386
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/devices/OculusManager.cpp
View file

@ -6,8 +6,9 @@
// Copyright (c) 2012 High Fidelity, Inc. All rights reserved. // Copyright (c) 2012 High Fidelity, Inc. All rights reserved.
// //
#include "InterfaceConfig.h"
#ifdef WIN32 #ifdef WIN32
#define WANT_TIMEVAL
#include <Systime.h> #include <Systime.h>
#endif #endif
@ -16,7 +17,6 @@
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "Application.h" #include "Application.h"
#include "InterfaceConfig.h"
#include "OculusManager.h" #include "OculusManager.h"
ProgramObject OculusManager::_program; ProgramObject OculusManager::_program;

3
interface/src/devices/TV3DManager.cpp
View file

@ -6,15 +6,14 @@
// Copyright (c) 2013 High Fidelity, Inc. All rights reserved. // Copyright (c) 2013 High Fidelity, Inc. All rights reserved.
// //
#include "InterfaceConfig.h"
#include <QOpenGLFramebufferObject> #include <QOpenGLFramebufferObject>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include "InterfaceConfig.h"
#ifdef WIN32 #ifdef WIN32
#define WANT_TIMEVAL
#include <Systime.h> #include <Systime.h>
#endif #endif