Dont include gl3w on osx

bitfieldaudio · Jul 26, 2018 · cc936b9 · cc936b9
1 parent 09164bd
commit cc936b9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/boards/parts/ui/glfw/config.cmake b/boards/parts/ui/glfw/config.cmake
@@ -1,6 +1,8 @@
 # Generate gl3w files
-include("${OTTO_EXTERNAL_DIR}/gl3w_gen.cmake")
-gl3w_gen("${OTTO_EXTERNAL_DIR}/")
+if(NOT APPLE)
+    include("${OTTO_EXTERNAL_DIR}/gl3w_gen.cmake")
+    gl3w_gen("${OTTO_EXTERNAL_DIR}/")
+endif()
 
 # GLFW
 set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "Build GLFW examples")

diff --git a/boards/parts/ui/glfw/include/board/ui/keys.hpp b/boards/parts/ui/glfw/include/board/ui/keys.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#ifndef __APPLE__
 #include <GL/gl3w.h>
+#endif
 #include <GLFW/glfw3.h>
 
 #include "util/algorithm.hpp"

diff --git a/boards/parts/ui/glfw/src/glfw_ui.cpp b/boards/parts/ui/glfw/src/glfw_ui.cpp
@@ -15,7 +15,9 @@
 #include "board/ui/keys.hpp"
 
 // C APIs. Include last
+#ifndef __APPLE__
 #include <GL/gl3w.h>
+#endif
 #include <GLFW/glfw3.h>
 #include <nanovg_gl.h>