diff options
author | Kostadin Damyanov <maxmight@gmail.com> | 2015-05-29 23:36:48 +0300 |
---|---|---|
committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-05-29 23:36:48 +0300 |
commit | db459fba1db908b21d6ea3e99c6e75d65c6cc6b0 (patch) | |
tree | a402ee37ef48d5640eb0ade6642d6f64b5fe1ea6 /platform/haiku | |
parent | 513d509783678d1a6c9fd47d7e2e822d886f2c84 (diff) |
Haiku: fix build, link with libGL and libGLEW
Diffstat (limited to 'platform/haiku')
-rw-r--r-- | platform/haiku/detect.py | 9 | ||||
-rw-r--r-- | platform/haiku/os_haiku.cpp | 1 | ||||
-rw-r--r-- | platform/haiku/platform_config.h | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py index bb123c6aa0..2c15720a92 100644 --- a/platform/haiku/detect.py +++ b/platform/haiku/detect.py @@ -50,6 +50,11 @@ def configure(env): env.Append(CCFLAGS=['-g2', '-Wall','-DDEBUG_ENABLED','-DDEBUG_MEMORY_ENABLED']) #env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) - env.Append(CPPFLAGS = ['-DOPENGL_ENABLED', '-DGLEW_ENABLED']) + env.Append(CPPFLAGS = ['-DOPENGL_ENABLED']) env.Append(CPPFLAGS = ['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL']) - env.Append(LIBS = ['be', 'z', 'network', 'bnetapi']) + env.Append(LIBS = ['be', 'GL', 'GLEW', 'z', 'network', 'bnetapi']) + + import methods + env.Append(BUILDERS = {'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl')}) + env.Append(BUILDERS = {'GLSL' : env.Builder(action = methods.build_glsl_headers, suffix = 'glsl.h',src_suffix = '.glsl')}) + env.Append(BUILDERS = {'GLSL120GLES' : env.Builder(action = methods.build_gles2_headers, suffix = 'glsl.h',src_suffix = '.glsl')}) diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 103b1ac748..dc3419b09e 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -1,4 +1,5 @@ #include "servers/visual/visual_server_raster.h" +#include "servers/visual/visual_server_wrap_mt.h" #include "drivers/gles2/rasterizer_gles2.h" #include "os_haiku.h" diff --git a/platform/haiku/platform_config.h b/platform/haiku/platform_config.h index b63b600fc1..691bdbdb9c 100644 --- a/platform/haiku/platform_config.h +++ b/platform/haiku/platform_config.h @@ -3,4 +3,4 @@ // for ifaddrs.h needed in drivers/unix/ip_unix.cpp #define _BSD_SOURCE 1 -#define GLES2_INCLUDE_H "gl_context/glew.h" +#define GLES2_INCLUDE_H <GL/glew.h> |