summaryrefslogtreecommitdiff
path: root/servers/visual
diff options
context:
space:
mode:
authorBastiaanOlij <mux213@gmail.com>2017-01-04 21:56:56 +1100
committerBastiaanOlij <mux213@gmail.com>2017-01-04 23:34:02 +1100
commit55d425807f6f1784d6ffd84586ae7efd77c1b352 (patch)
treed0bf39db6098ef54b502ba157c406f1d107e917c /servers/visual
parent76c2e8583e70e8c976a306e77a40e8e7226aa249 (diff)
First set of changes to fix compilation errors and initialise the gles3 renderer for Mac OS X. Still broken at this point.
Diffstat (limited to 'servers/visual')
-rw-r--r--servers/visual/shader_language.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h
index 6326b5089e..b5f843c114 100644
--- a/servers/visual/shader_language.h
+++ b/servers/visual/shader_language.h
@@ -151,6 +151,11 @@ public:
/* COMPILER */
+ // lame work around to Apple defining this as a macro in 10.12 SDK
+ #ifdef TYPE_BOOL
+ #undef TYPE_BOOL
+ #endif
+
enum DataType {
TYPE_VOID,
TYPE_BOOL,