diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2017-03-01 17:37:33 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-03-01 17:37:33 +0100 |
| commit | fd89246426e73cd8d0f85eeb4c2c6977facbb9bb (patch) | |
| tree | c66295c37b9ec610ac1ac246b121f7bfa2da673b /package/sdl2 | |
| parent | 5573ab458696a9aaffc28464dd9654b8c95a5815 (diff) | |
| parent | 9a6c03a390872d7ce91b619fdaf1d674491ad8cb (diff) | |
| download | buildroot-fd89246426e73cd8d0f85eeb4c2c6977facbb9bb.tar.gz buildroot-fd89246426e73cd8d0f85eeb4c2c6977facbb9bb.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/sdl2')
| -rw-r--r-- | package/sdl2/Config.in | 18 | ||||
| -rw-r--r-- | package/sdl2/sdl2.mk | 16 |
2 files changed, 32 insertions, 2 deletions
diff --git a/package/sdl2/Config.in b/package/sdl2/Config.in index 8fc14ee737..a2971edc89 100644 --- a/package/sdl2/Config.in +++ b/package/sdl2/Config.in @@ -29,6 +29,24 @@ comment "X11 video driver needs X.org" depends on !BR2_PACKAGE_XORG7 depends on BR2_USE_MMU +config BR2_PACKAGE_SDL2_OPENGL + bool "OpenGL (GLX)" + depends on BR2_PACKAGE_HAS_LIBGL + depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_MMU # X11 video driver + select BR2_PACKAGE_SDL2_X11 + +comment "OpenGL support needs X11 and an OpenGL provider" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 + +config BR2_PACKAGE_SDL2_OPENGLES + bool "OpenGL ES" + depends on BR2_PACKAGE_HAS_LIBGLES + +comment "OpenGL ES support needs an OpenGL ES provider" + depends on !BR2_PACKAGE_HAS_LIBGLES + endif comment "sdl2 needs a toolchain w/ dynamic library" diff --git a/package/sdl2/sdl2.mk b/package/sdl2/sdl2.mk index 2ec12e639e..d2ee50dc1d 100644 --- a/package/sdl2/sdl2.mk +++ b/package/sdl2/sdl2.mk @@ -18,8 +18,6 @@ SDL2_CONF_OPTS += \ --disable-esd \ --disable-dbus \ --disable-pulseaudio \ - --disable-video-opengl \ - --disable-video-opengles \ --disable-video-wayland # We must enable static build to get compilation successful. @@ -99,6 +97,20 @@ else SDL2_CONF_OPTS += --disable-video-x11 --without-x endif +ifeq ($(BR2_PACKAGE_SDL2_OPENGL),y) +SDL2_CONF_OPTS += --enable-video-opengl +SDL2_DEPENDENCIES += libgl +else +SDL2_CONF_OPTS += --disable-video-opengl +endif + +ifeq ($(BR2_PACKAGE_SDL2_OPENGLES),y) +SDL2_CONF_OPTS += --enable-video-opengles +SDL2_DEPENDENCIES += libgles +else +SDL2_CONF_OPTS += --disable-video-opengles +endif + ifeq ($(BR2_PACKAGE_TSLIB),y) SDL2_DEPENDENCIES += tslib SDL2_CONF_OPTS += --enable-input-tslib |
