aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/window_texture.h9
-rw-r--r--src/main.cpp9
2 files changed, 10 insertions, 8 deletions
diff --git a/include/window_texture.h b/include/window_texture.h
index acf349a..ea3ff10 100644
--- a/include/window_texture.h
+++ b/include/window_texture.h
@@ -1,8 +1,11 @@
#ifndef WINDOW_TEXTURE_H
#define WINDOW_TEXTURE_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
#define GLX_GLXEXT_PROTOTYPES
-#include <GL/glew.h>
#include <GL/glx.h>
#include <GL/glxext.h>
#include <X11/Xlib.h>
@@ -28,4 +31,8 @@ int window_texture_on_resize(WindowTexture *self);
GLuint window_texture_get_opengl_texture_id(WindowTexture *self);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* WINDOW_TEXTURE_H */
diff --git a/src/main.cpp b/src/main.cpp
index 70bd513..8101a89 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -31,14 +31,11 @@
// Modified by: DEC05EBA
-extern "C" {
+#include <GL/glew.h>
#include "../include/window_texture.h"
-}
#include <SDL.h>
-#include <GL/glew.h>
#include <SDL_opengl.h>
-#include <GL/glu.h>
#include <openvr.h>
#define GLX_GLXEXT_PROTOTYPES
#include <GL/glx.h>
@@ -46,11 +43,9 @@ extern "C" {
#include <glm/glm.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
-#include <X11/Xlib.h>
#include <X11/XKBlib.h>
+#include <X11/Xlib.h>
#include <X11/extensions/Xfixes.h>
-#include <X11/Xproto.h>
-#include <GL/glxproto.h>
#include <stdio.h>
#include <string>