Browse Source

get glew by meson wrapper

Kajetan Johannes Hammerle 2 years ago
parent
commit
610ddfd6e2
5 changed files with 18 additions and 5 deletions
  1. 2 0
      .gitignore
  2. 3 2
      meson.build
  3. 0 1
      rendering/Window.h
  4. 12 0
      subprojects/glew.wrap
  5. 1 2
      wrapper/GL.cpp

+ 2 - 0
.gitignore

@@ -0,0 +1,2 @@
+subprojects/*
+!subprojects/*.wrap

+ 3 - 2
meson.build

@@ -67,16 +67,17 @@ compiler = meson.get_compiler('cpp')
 args = compiler.get_supported_arguments(['-Wall', '-Wextra', '-pedantic', '-Werror'])
 
 thread_dep = dependency('threads')
-glew_dep = dependency('glew')
 glfw_dep = dependency('glfw3')
 gl_dep = dependency('GL')
 
+glew_proj = subproject('glew')
+glew_dep = glew_proj.get_variable('glew_dep')
+
 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)
 
 libgamingcore_include = include_directories('.', 
-    glew_dep.get_pkgconfig_variable('includedir'),
     glfw_dep.get_pkgconfig_variable('includedir'))
 
 libgamingcore = static_library('gamingcore', 

+ 0 - 1
rendering/Window.h

@@ -1,7 +1,6 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#define GLEW_STATIC
 #define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>
 

+ 12 - 0
subprojects/glew.wrap

@@ -0,0 +1,12 @@
+[wrap-file]
+directory = glew-2.1.0
+source_url = http://downloads.sourceforge.net/glew/glew-2.1.0.tgz
+source_filename = glew-2.1.0.tgz
+source_hash = 04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95
+patch_url = https://wrapdb.mesonbuild.com/v1/projects/glew/2.1.0/3/get_zip
+patch_filename = glew-2.1.0-3-wrap.zip
+patch_hash = 46674cf81f9f8d70003b3a2505a9f6faa7437f63e6606b1200225c2fca575a11
+
+[provide]
+glew = glew_dep
+

+ 1 - 2
wrapper/GL.cpp

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