diff options
author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2022-04-29 12:31:55 +0200 |
---|---|---|
committer | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2022-08-01 17:30:44 +0200 |
commit | abfead37587f1f2e124bdfcde755b6e90421b538 (patch) | |
tree | ad0d05a94bef8f663b746249d7c0c4de6e8c3bfe /src/egl/eglut | |
parent | 49c89ab7a96a2ef5e3200e56d3043372e736e4c9 (diff) | |
download | mesa-demos-abfead37587f1f2e124bdfcde755b6e90421b538.tar.gz |
remove cmake and autotools support
These build systems were deprecated in Mesa-Demos 8.5.0, which was
released at the end of May. It's about time to remove them, so people
don't have to keep maintaining three build systems.
Reviewed-by: Emma Anholt <emma@anholt.net>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Diffstat (limited to 'src/egl/eglut')
-rw-r--r-- | src/egl/eglut/CMakeLists.txt | 29 | ||||
-rw-r--r-- | src/egl/eglut/Makefile.am | 76 |
2 files changed, 0 insertions, 105 deletions
diff --git a/src/egl/eglut/CMakeLists.txt b/src/egl/eglut/CMakeLists.txt deleted file mode 100644 index 4dcadaf8..00000000 --- a/src/egl/eglut/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -include_directories ( - ${EGL_INCLUDE_DIRS} -) - -if (X11_FOUND) - add_library (eglut_x11 eglut.h eglut.c eglutint.h eglut_x11.c) - target_link_libraries (eglut_x11 ${EGL_LIBRARIES} ${X11_X11_LIB}) - if (BUILD_SHARED_LIBS) - install (TARGETS eglut_x11 DESTINATION ${LIBDIR}) - endif (BUILD_SHARED_LIBS) -endif (X11_FOUND) - -if (BUILD_WAYLAND) - ecm_add_wayland_client_protocol (eglut_wayland_proto_SOURCES - PROTOCOL "${WaylandProtocols_DATADIR}/stable/xdg-shell/xdg-shell.xml" - BASENAME xdg-shell) - - add_library (eglut_wayland - eglut.h eglut.c - eglutint.h eglut_wayland.c - ${eglut_wayland_proto_SOURCES}) - target_compile_options (eglut_wayland PRIVATE ${Wayland_DEFINITIONS}) - target_include_directories (eglut_wayland PRIVATE - ${Wayland_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) - target_link_libraries (eglut_wayland ${EGL_LIBRARIES} ${Wayland_LIBRARIES}) - if (BUILD_SHARED_LIBS) - install (TARGETS eglut_wayland DESTINATION ${LIBDIR}) - endif (BUILD_SHARED_LIBS) -endif (BUILD_WAYLAND) diff --git a/src/egl/eglut/Makefile.am b/src/egl/eglut/Makefile.am deleted file mode 100644 index 9cdc5edd..00000000 --- a/src/egl/eglut/Makefile.am +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright © 2009 Intel Corporation -# -# Permission is hereby granted, free of charge, to any person obtaining a -# copy of this software and associated documentation files (the "Software"), -# to deal in the Software without restriction, including without limitation -# the rights to use, copy, modify, merge, publish, distribute, sublicense, -# and/or sell copies of the Software, and to permit persons to whom the -# Software is furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice (including the next -# paragraph) shall be included in all copies or substantial portions of the -# Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -# IN THE SOFTWARE. -# -# Authors: -# Eric Anholt <eric@anholt.net> - -AM_CFLAGS = $(EGL_CFLAGS) -AM_LDFLAGS = $(EGL_LIBS) - -if HAVE_EGL -if HAVE_X11 -eglut_x11 = libeglut_x11.la -endif -if HAVE_WAYLAND -eglut_wayland = libeglut_wayland.la -endif - -noinst_LTLIBRARIES = $(eglut_x11) $(eglut_wayland) -endif - -libeglut_x11_la_SOURCES = \ - eglut.c \ - eglut.h \ - eglutint.h \ - eglut_x11.c -libeglut_x11_la_CFLAGS = $(X11_CFLAGS) $(EGL_CFLAGS) -libeglut_x11_la_LIBADD = $(X11_LIBS) $(EGL_LIBS) - -XDG_SHELL_XML = $(WAYLAND_PROTOCOLS_DATADIR)/stable/xdg-shell/xdg-shell.xml - -wayland-xdg-shell-protocol.c: $(XDG_SHELL_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ - -wayland-xdg-shell-client-protocol.h: $(XDG_SHELL_XML) - $(MKDIR_GEN) - $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@ - -if HAVE_WAYLAND -BUILT_SOURCES = \ - wayland-xdg-shell-protocol.c \ - wayland-xdg-shell-client-protocol.h -endif - -libeglut_wayland_la_SOURCES = \ - eglut.c \ - eglut.h \ - eglutint.h \ - eglut_wayland.c -nodist_libeglut_wayland_la_SOURCES = \ - wayland-xdg-shell-protocol.c \ - wayland-xdg-shell-client-protocol.h - -libeglut_wayland_la_CFLAGS = $(WAYLAND_CFLAGS) $(EGL_CFLAGS) -libeglut_wayland_la_LIBADD = $(WAYLAND_LIBS) $(EGL_LIBS) - -EXTRA_DIST = \ - meson.build |