Cleanup of backend option strings.

This commit is contained in:
Camilla Berglund 2012-12-02 19:01:20 +01:00
parent 14e71833bd
commit 5da8ed250a
5 changed files with 11 additions and 2 deletions

View File

@ -14,7 +14,10 @@ option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ON)
option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON) option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON)
option(GLFW_NATIVE_API "Build the GLFW native API" OFF) option(GLFW_NATIVE_API "Build the GLFW native API" OFF)
option(BUILD_SHARED_LIBS "Build shared libraries" OFF) option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
option(GLFW_USE_EGL "Build for EGL and OpenGL ES platform (Currently only X11)" OFF)
if (NOT APPLE)
option(GLFW_USE_EGL "Use EGL for context creation" OFF)
endif()
if (GLFW_USE_EGL) if (GLFW_USE_EGL)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake/modules) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake/modules)

View File

@ -42,6 +42,8 @@ typedef void* id;
#if defined(_GLFW_NSGL) #if defined(_GLFW_NSGL)
#include "nsgl_platform.h" #include "nsgl_platform.h"
#else
#error "No supported context creation API selected"
#endif #endif
#define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowNS NS #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowNS NS

View File

@ -72,7 +72,7 @@ typedef struct _GLFWlibrary _GLFWlibrary;
#elif defined(_GLFW_X11) #elif defined(_GLFW_X11)
#include "x11_platform.h" #include "x11_platform.h"
#else #else
#error "No supported platform selected" #error "No supported window creation API selected"
#endif #endif

View File

@ -111,6 +111,8 @@ typedef DWORD (WINAPI * TIMEGETTIME_T) (void);
#define _GLFW_EGL_NATIVE_WINDOW window->Win32.handle #define _GLFW_EGL_NATIVE_WINDOW window->Win32.handle
#define _GLFW_EGL_NATIVE_DISPLAY NULL #define _GLFW_EGL_NATIVE_DISPLAY NULL
#include "egl_platform.h" #include "egl_platform.h"
#else
#error "No supported context creation API selected"
#endif #endif
#define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowWin32 Win32 #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowWin32 Win32

View File

@ -61,6 +61,8 @@
#define _GLFW_EGL_NATIVE_WINDOW window->X11.handle #define _GLFW_EGL_NATIVE_WINDOW window->X11.handle
#define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display #define _GLFW_EGL_NATIVE_DISPLAY _glfwLibrary.X11.display
#include "egl_platform.h" #include "egl_platform.h"
#else
#error "No supported context creation API selected"
#endif #endif
#define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11 #define _GLFW_PLATFORM_WINDOW_STATE _GLFWwindowX11 X11