From cc936b9c45af0abd29436a8bdd420bfa3ff1fa96 Mon Sep 17 00:00:00 2001 From: topisani Date: Thu, 26 Jul 2018 10:56:24 +0200 Subject: [PATCH] Dont include gl3w on osx --- boards/parts/ui/glfw/config.cmake | 6 ++++-- boards/parts/ui/glfw/include/board/ui/keys.hpp | 2 ++ boards/parts/ui/glfw/src/glfw_ui.cpp | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/boards/parts/ui/glfw/config.cmake b/boards/parts/ui/glfw/config.cmake index eae0d5cac..4ddf701da 100644 --- 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 index 13e753726..a04ae7db5 100644 --- 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 +#endif #include #include "util/algorithm.hpp" diff --git a/boards/parts/ui/glfw/src/glfw_ui.cpp b/boards/parts/ui/glfw/src/glfw_ui.cpp index 189b08560..92b9cab4c 100644 --- 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 +#endif #include #include