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

revert out the InterfaceConfig.h changes

Browse source
This commit is contained in:
ZappoMan 2014-12-15 10:12:04 -08:00
parent 7d1081473e
commit 6b39783de7
5 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/Application.h
View file

@ -12,9 +12,6 @@
#ifndef hifi_Application_h
#define hifi_Application_h
// include this before QGLWidget, which includes an earlier version of OpenGL
#include "InterfaceConfig.h"
#include <map>
#include <time.h>

2
interface/src/renderer/GeometryCache.h
View file

@ -13,7 +13,7 @@
#define hifi_GeometryCache_h
// include this before QOpenGLBuffer, which includes an earlier version of OpenGL
#include <gpu/GPUConfig.h>
#include "InterfaceConfig.h"
#include <QMap>
#include <QOpenGLBuffer>

2
interface/src/renderer/TextureCache.cpp
View file

@ -10,7 +10,7 @@
//
// include this before QGLWidget, which includes an earlier version of OpenGL
#include <gpu/GPUConfig.h>
#include "InterfaceConfig.h"
#include <QEvent>
#include <QGLWidget>

2
interface/src/renderer/TextureCache.h
View file

@ -18,7 +18,7 @@
#include <ResourceCache.h>
#include <gpu/GPUConfig.h>
#include "InterfaceConfig.h"
class QOpenGLFramebufferObject;

2
interface/src/voxels/VoxelSystem.cpp
View file

@ -9,6 +9,7 @@
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
#include <gpu/GPUConfig.h> // include this first
#include <cstring>
#include <cmath>
@ -24,7 +25,6 @@
#include <glm/gtc/type_ptr.hpp>
#include "Application.h"
#include "InterfaceConfig.h"
#include "Menu.h"
#include "renderer/ProgramObject.h"
#include "VoxelConstants.h"