Browse Source

fix include paths

Kajetan Johannes Hammerle 2 years ago
parent
commit
135370f444
5 changed files with 4 additions and 4 deletions
  1. 0 0
      GL/glew.c
  2. 0 0
      GL/glew.h
  3. 1 1
      input/Buttons.h
  4. 2 2
      meson.build
  5. 1 1
      wrapper/GL.cpp

+ 0 - 0
glew/glew.c → GL/glew.c


+ 0 - 0
glew/glew.h → GL/glew.h


+ 1 - 1
input/Buttons.h

@@ -1,7 +1,7 @@
 #ifndef BUTTONS_H
 #define BUTTONS_H
 
-#include "glew/glew.h"
+#include "GL/glew.h"
 
 #include "GLFW/glfw3.h"
 

+ 2 - 2
meson.build

@@ -31,7 +31,7 @@ src = [
     'utils/Size.cpp',
     'wrapper/GL.cpp',
     'lodepng/lodepng.cpp',
-    'glew/glew.c'
+    'GL/glew.c'
 ]
 
 src_tests = [
@@ -80,7 +80,7 @@ glu_dep = compiler.find_library('glu32', required: false)
 dl_dep = compiler.find_library('dl', required: false)
 glu_dep = compiler.find_library('GLU', required: false)
 
-libgamingcore_include = include_directories('.')
+libgamingcore_include = include_directories('.', 'subprojects/glfw/include')
 
 libgamingcore = static_library('gamingcore', 
     sources: src,

+ 1 - 1
wrapper/GL.cpp

@@ -1,4 +1,4 @@
-#include "glew/glew.h"
+#include "GL/glew.h"
 #include <GL/glu.h>
 #include <type_traits>