diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-05 08:37:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-05 08:37:06 +0100 |
| commit | e39a6242ac1c503a3c35f40c8a44296fa9df28cb (patch) | |
| tree | 2679fbc9347eb5096a3e04ee1152db8654ecbea1 /platform/osx/os_osx.h | |
| parent | d8e54b1e2620be99a3f1fdc7df11009f5a107eaa (diff) | |
| parent | 5e717ed8a38dee1b6c722ad0827a764d45089cdb (diff) | |
Merge pull request #7429 from BastiaanOlij/glew3-osx
Fixing compilation errors for gles3 for Mac OS X
Diffstat (limited to 'platform/osx/os_osx.h')
| -rw-r--r-- | platform/osx/os_osx.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 8c4eb28ff0..a547e318c8 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -35,7 +35,7 @@ #include "drivers/unix/os_unix.h" #include "main/input_default.h" #include "servers/visual_server.h" -#include "servers/visual/visual_server_wrap_mt.h" +// #include "servers/visual/visual_server_wrap_mt.h" #include "servers/visual/rasterizer.h" #include "servers/physics_server.h" #include "servers/audio/audio_server_sw.h" @@ -58,7 +58,8 @@ class OS_OSX : public OS_Unix { public: bool force_quit; - Rasterizer *rasterizer; +// rasterizer seems to no longer be given to visual server, its using GLES3 directly? +// Rasterizer *rasterizer; VisualServer *visual_server; List<String> args; |