Browse Source

more windows fixes

Kajetan Johannes Hammerle 3 years ago
parent
commit
eea302e44b
3 changed files with 7 additions and 5 deletions
  1. 5 4
      meson.build
  2. 1 1
      rendering/Window.h
  3. 1 0
      wrapper/GL.cpp

+ 5 - 4
meson.build

@@ -73,19 +73,20 @@ gl_dep = dependency('GL')
 
 ws2_32_dep = compiler.find_library('ws2_32', required: false)
 winmm_dep = compiler.find_library('winmm', required: false)
+glu_dep = compiler.find_library('glu32', required: false)
 
-inc = include_directories('.', 
+libgamingcore_include = include_directories('.', 
     glew_dep.get_pkgconfig_variable('includedir'),
     glfw_dep.get_pkgconfig_variable('includedir'),
     png_dep.get_pkgconfig_variable('includedir'))
 
 libgamingcore = static_library('gamingcore', 
     sources: src,
-    include_directories : inc,
-    dependencies : [thread_dep, glew_dep, glfw_dep, png_dep, zlib_dep, gl_dep, ws2_32_dep, winmm_dep],
+    include_directories : libgamingcore_include,
+    dependencies : [thread_dep, glew_dep, glfw_dep, png_dep, zlib_dep, gl_dep, ws2_32_dep, winmm_dep, glu_dep],
     cpp_args: args)
 libgamingcore_dep = declare_dependency(
-    include_directories: inc, 
+    include_directories: libgamingcore_include, 
     link_with: libgamingcore)
 
 executable('tests', 

+ 1 - 1
rendering/Window.h

@@ -1,7 +1,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <GL/glew.h>
+#define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 
 #include "input/Buttons.h"

+ 1 - 0
wrapper/GL.cpp

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