diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 16:08:14 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 16:09:12 +0000 |
| commit | 54491dce60ddce0cca509d030b0c38093a8be535 (patch) | |
| tree | 6342b491e8ccf753fb25d4ef004f9d276e4b1cfe /external/epoxy | |
| parent | 1141f178382be0add06ba182cc02c2adb7e96324 (diff) | |
turn off epoxy egl support by default and enable only when gtk3 is enabled
to build on the festering baseline on which gtk3 is disabled
Change-Id: I6c074382590fc60ae8572fbde225679e4309494e
Diffstat (limited to 'external/epoxy')
| -rw-r--r-- | external/epoxy/Library_epoxy.mk | 11 | ||||
| -rw-r--r-- | external/epoxy/UnpackedTarball_epoxy.mk | 1 | ||||
| -rw-r--r-- | external/epoxy/epoxy.noegl.by.default.patch | 11 |
3 files changed, 23 insertions, 0 deletions
diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk index 28f9dab6b709..10be001dc727 100644 --- a/external/epoxy/Library_epoxy.mk +++ b/external/epoxy/Library_epoxy.mk @@ -55,9 +55,20 @@ else $(eval $(call gb_Library_add_generated_cobjects,epoxy,\ UnpackedTarball/epoxy/src/dispatch_glx \ UnpackedTarball/epoxy/src/glx_generated_dispatch \ +)) +ifeq ($(ENABLE_GTK3),TRUE) +$(eval $(call gb_Library_add_cflags,epoxy,\ + -DPLATFORM_HAS_EGL=1 \ +)) +$(eval $(call gb_Library_add_generated_cobjects,epoxy,\ UnpackedTarball/epoxy/src/dispatch_egl \ UnpackedTarball/epoxy/src/egl_generated_dispatch \ )) +else +$(eval $(call gb_Library_add_cflags,epoxy,\ + -DPLATFORM_HAS_EGL=0 \ +)) +endif endif # vim: set noet sw=4 ts=4: diff --git a/external/epoxy/UnpackedTarball_epoxy.mk b/external/epoxy/UnpackedTarball_epoxy.mk index 76c0fdf9cee9..0d51548e3eee 100644 --- a/external/epoxy/UnpackedTarball_epoxy.mk +++ b/external/epoxy/UnpackedTarball_epoxy.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,epoxy,0)) $(eval $(call gb_UnpackedTarball_add_patches,epoxy, \ external/epoxy/epoxy.windows.api.patch \ + external/epoxy/epoxy.noegl.by.default.patch \ )) # vim: set noet sw=4 ts=4: diff --git a/external/epoxy/epoxy.noegl.by.default.patch b/external/epoxy/epoxy.noegl.by.default.patch new file mode 100644 index 000000000000..d80a3b99f15c --- /dev/null +++ b/external/epoxy/epoxy.noegl.by.default.patch @@ -0,0 +1,11 @@ +--- src/dispatch_common.h ++++ src/dispatch_common.h +@@ -39,7 +39,7 @@ + #define PLATFORM_HAS_WGL 0 + #define EPOXY_IMPORTEXPORT + #else +-#define PLATFORM_HAS_EGL 1 ++ + #define PLATFORM_HAS_GLX 1 + #define PLATFORM_HAS_WGL 0 + #define EPOXY_IMPORTEXPORT |