diff options
| author | Daniel Stone <daniels@collabora.com> | 2017-07-17 11:59:46 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2017-07-17 11:59:46 +0100 |
| commit | 66136b9548de7578a905dfd24c472a5921046c9e (patch) | |
| tree | 1298725af453acf9c2479c7ace6136f01eb55c75 | |
| parent | c539078c5fa592134f6f8a95be51c8eb318f5c39 (diff) | |
egl: Build some OpenGL demos for Wayland
| -rw-r--r-- | src/egl/opengl/.gitignore | 4 | ||||
| -rw-r--r-- | src/egl/opengl/Makefile.am | 18 | ||||
| -rw-r--r-- | src/egl/opengles2/.gitignore | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/src/egl/opengl/.gitignore b/src/egl/opengl/.gitignore index 930504c0..c0819d3e 100644 --- a/src/egl/opengl/.gitignore +++ b/src/egl/opengl/.gitignore @@ -1,6 +1,10 @@ +eglgears_screen +eglgears_wayland eglgears_x11 eglinfo eglkms +egltri_screen +egltri_wayland egltri_x11 peglgears xeglbindtex diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am index fe7faa95..b745573a 100644 --- a/src/egl/opengl/Makefile.am +++ b/src/egl/opengl/Makefile.am @@ -42,6 +42,12 @@ EGL_X11_DEMOS = \ xeglthreads endif +if HAVE_WAYLAND +EGL_WL_DEMOS = \ + eglgears_wayland \ + egltri_wayland +endif + if HAVE_DRM if HAVE_GBM EGL_DRM_DEMOS = \ @@ -54,7 +60,8 @@ noinst_PROGRAMS = \ eglinfo \ peglgears \ $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) + $(EGL_X11_DEMOS) \ + $(EGL_WL_DEMOS) endif egltri_x11_SOURCES = egltri.c @@ -68,6 +75,15 @@ xeglthreads_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS) -pthread eglgears_x11_LDADD = ../eglut/libeglut_x11.la egltri_x11_LDADD = ../eglut/libeglut_x11.la +egltri_wayland_SOURCES = egltri.c +eglgears_wayland_SOURCES = eglgears.c + +eglgears_x11_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS) +egltri_x11_LDFLAGS = $(AM_LDFLAGS) $(X11_LIBS) + +eglgears_wayland_LDADD = ../eglut/libeglut_wayland.la +egltri_wayland_LDADD = ../eglut/libeglut_wayland.la + eglkms_SOURCES = eglkms.c eglkms_CFLAGS = $(AM_CFLAGS) $(DRM_CFLAGS) $(GBM_CFLAGS) eglkms_LDADD = $(AM_LDFLAGS) $(DRM_LIBS) $(GBM_LIBS) diff --git a/src/egl/opengles2/.gitignore b/src/egl/opengles2/.gitignore index 4d0268d1..68384608 100644 --- a/src/egl/opengles2/.gitignore +++ b/src/egl/opengles2/.gitignore @@ -1,4 +1,6 @@ es2gears +es2gears_screen +es2gears_wayland es2gears_x11 es2_info es2tri |