mirror of
https://github.com/gwm17/glfw.git
synced 2024-11-29 21:48:52 -05:00
Remove support for Universal Binaries
This commit is contained in:
parent
aee6b8765e
commit
42efd26698
|
@ -30,7 +30,6 @@ if (WIN32)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (APPLE)
|
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_CHDIR "Make glfwInit chdir to Contents/Resources" ON)
|
||||||
option(GLFW_USE_MENUBAR "Populate the menu bar on first window creation" 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)
|
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)
|
set(_GLFW_USE_RETINA 1)
|
||||||
endif()
|
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
|
# Set up library and include paths
|
||||||
find_library(COCOA_FRAMEWORK Cocoa)
|
find_library(COCOA_FRAMEWORK Cocoa)
|
||||||
find_library(IOKIT_FRAMEWORK IOKit)
|
find_library(IOKIT_FRAMEWORK IOKit)
|
||||||
|
|
|
@ -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
|
`GLFW_USE_RETINA` determines whether windows will use the full resolution of
|
||||||
Retina displays.
|
Retina displays.
|
||||||
|
|
||||||
`GLFW_BUILD_UNIVERSAL` determines whether to build Universal Binaries.
|
|
||||||
|
|
||||||
|
|
||||||
@subsubsection compile_options_win32 Windows specific CMake options
|
@subsubsection compile_options_win32 Windows specific CMake options
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user