From 42efd26698d3df3ca03f0e53db0a9f90a3a6238e Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 18 Oct 2015 19:33:58 +0200 Subject: [PATCH] Remove support for Universal Binaries --- CMakeLists.txt | 8 -------- docs/compile.dox | 2 -- 2 files changed, 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a1f8c9d2..80bc3188 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,7 +30,6 @@ if (WIN32) endif() if (APPLE) - option(GLFW_BUILD_UNIVERSAL "Build GLFW as a Universal Binary" OFF) option(GLFW_USE_CHDIR "Make glfwInit chdir to Contents/Resources" ON) option(GLFW_USE_MENUBAR "Populate the menu bar on first window creation" ON) option(GLFW_USE_RETINA "Use the full resolution of Retina displays" ON) @@ -340,13 +339,6 @@ if (_GLFW_COCOA AND _GLFW_NSGL) set(_GLFW_USE_RETINA 1) endif() - if (GLFW_BUILD_UNIVERSAL) - message(STATUS "Building GLFW as Universal Binaries") - set(CMAKE_OSX_ARCHITECTURES i386;x86_64) - else() - message(STATUS "Building GLFW only for the native architecture") - endif() - # Set up library and include paths find_library(COCOA_FRAMEWORK Cocoa) find_library(IOKIT_FRAMEWORK IOKit) diff --git a/docs/compile.dox b/docs/compile.dox index 2b374b30..1b4ce218 100644 --- a/docs/compile.dox +++ b/docs/compile.dox @@ -201,8 +201,6 @@ directory of bundled applications to the `Contents/Resources` directory. `GLFW_USE_RETINA` determines whether windows will use the full resolution of Retina displays. -`GLFW_BUILD_UNIVERSAL` determines whether to build Universal Binaries. - @subsubsection compile_options_win32 Windows specific CMake options