diff options
| author | Eric Anholt <eric@anholt.net> | 2015-01-10 10:29:17 +1300 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2015-01-10 10:30:16 +1300 |
| commit | 363d57a9de7d9241264590c35638705f14022daa (patch) | |
| tree | 946d6494ae02c4afef0562331ddf6ba1d90c45c6 | |
| parent | b2ae054b3aa0d6796b6936c7a89b8cce7cefe7ba (diff) | |
| parent | e3051481cc9f5b7b36b317aff1454ee16ea9cdb9 (diff) | |
| download | libepoxy-363d57a9de7d9241264590c35638705f14022daa.tar.gz | |
Merge remote-tracking branch 'sonicadvance/OSX-NoX11Support'
I've come around to the various contributors' positions: X11 on OSX is
basically dead, and we're not serving our users by trying to support
it.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/dispatch_common.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index f97c9b0..a52fc58 100644 --- a/configure.ac +++ b/configure.ac @@ -78,7 +78,7 @@ case $host_os in ;; darwin*) build_egl=no - build_glx=yes + build_glx=no build_wgl=no build_apple=yes has_znow=no diff --git a/src/dispatch_common.h b/src/dispatch_common.h index a4eb0f0..6b8503a 100644 --- a/src/dispatch_common.h +++ b/src/dispatch_common.h @@ -30,7 +30,7 @@ #define EPOXY_IMPORTEXPORT __declspec(dllexport) #elif defined(__APPLE__) #define PLATFORM_HAS_EGL 0 -#define PLATFORM_HAS_GLX 1 +#define PLATFORM_HAS_GLX 0 #define PLATFORM_HAS_WGL 0 #define EPOXY_IMPORTEXPORT #elif defined(ANDROID) |