diff options
| -rw-r--r-- | .editorconfig | 8 | ||||
| -rw-r--r-- | .gitignore | 15 | ||||
| -rw-r--r-- | Makefile.am | 68 | ||||
| -rwxr-xr-x | autogen.sh | 16 | ||||
| -rw-r--r-- | configure.ac | 275 | ||||
| -rw-r--r-- | epoxy.pc.in | 16 | ||||
| -rw-r--r-- | include/epoxy/Makefile.am | 42 | ||||
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 184 | ||||
| -rw-r--r-- | test/.gitignore | 24 | ||||
| -rw-r--r-- | test/Makefile.am | 192 |
11 files changed, 1 insertions, 841 deletions
diff --git a/.editorconfig b/.editorconfig index ce6000d..3473806 100644 --- a/.editorconfig +++ b/.editorconfig @@ -10,14 +10,6 @@ end_of_line = lf trim_trailing_whitespace = true insert_final_newline = true -[configure.ac] -indent_style = tab -indent_size = 8 - -[Makefile.am] -indent_style = tab -indent_size = 8 - [.travis.yml] indent_style = space indent_size = 2 @@ -77,18 +77,3 @@ core # Edit the following section as needed # For example, !report.pc overrides *.pc. See 'man gitignore' # -configure.lineno -.dirstamp -test-driver - -gl_generated_dispatch.c -gl_generated.h - -glx_generated_dispatch.c -glx_generated.h - -egl_generated_dispatch.c -egl_generated.h - -wgl_generated_dispatch.c -wgl_generated.h diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 8fead48..0000000 --- a/Makefile.am +++ /dev/null @@ -1,68 +0,0 @@ - -# Copyright © 2013 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. - -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = include/epoxy src - -SUBDIRS += test - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = epoxy.pc - -registry_files = \ - registry/egl.xml \ - registry/gl.xml \ - registry/glx.xml \ - registry/wgl.xml \ - $() - -meson_build_files = \ - meson_options.txt \ - meson.build \ - include/epoxy/meson.build \ - src/meson.build \ - test/meson.build \ - doc/meson.build \ - doc/Doxyfile.in \ - cross/fedora-mingw64.txt \ - $() - -EXTRA_DIST = \ - .dir-locals.el \ - README.md \ - autogen.sh \ - epoxy.pc.in \ - $(registry_files) \ - $(meson_build_files) \ - $() - -dist-hook: - @if test -d "$(top_srcdir)/.git"; then \ - echo Generating ChangeLog... ; \ - ( $(top_srcdir)/missing --run git log --stat ) > "$(top_srcdir)/ChangeLog.tmp" \ - && mv -f "$(top_srcdir)/ChangeLog.tmp" "$(top_distdir)/ChangeLog" \ - || ( rm -f "$(top_srcdir)/ChangeLog.tmp"; \ - echo Failed to generate ChangeLog >&2 ); \ - else \ - echo A git checkout is required to generate a ChangeLog >&2; \ - fi diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 02b81ef..0000000 --- a/autogen.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd "$srcdir" - -mkdir m4 || exit 1 - -autoreconf -v --install || exit $? -cd "$ORIGDIR" || exit $? - -if test -z "$NOCONFIGURE"; then - exec "$srcdir/configure" "$@" -fi diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 63ad8ee..0000000 --- a/configure.ac +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright © 2013 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. - -# Initialize Autoconf -AC_PREREQ([2.60]) -AC_INIT([libepoxy], - [1.5.4], - [https://github.com/anholt/libepoxy], - [libepoxy]) -AC_CONFIG_SRCDIR([Makefile.am]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) - -# Initialize Automake -AM_INIT_AUTOMAKE([foreign -Wno-portability dist-xz no-dist-gzip tar-ustar subdir-objects]) - -# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS -m4_ifndef([XORG_MACROS_VERSION], - [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen. - Hint: either install from source, git://anongit.freedesktop.org/xorg/util/macros or, - depending on you distribution, try package 'xutils-dev' or 'xorg-x11-util-macros'])]) - -XORG_MACROS_VERSION(1.8) -XORG_DEFAULT_OPTIONS - -AC_CHECK_PROGS([PYTHON], [python3]) - -# Initialize libtool -AC_DISABLE_STATIC -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL -AC_SYS_LARGEFILE - -AC_CHECK_HEADER([KHR/khrplatform.h], - [AC_DEFINE([HAVE_KHRPLATFORM_H], [1], - [Define to 1 if you have <KHR/khrplatform.h> (used for tests)] - )] - ) - -# OS X defaults to having -Wint-conversion ("warn when passing -# uintptr_t to a void *") by default. Kill that. -XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - -AC_ARG_ENABLE([x11], - [AC_HELP_STRING([--enable-x11=@<:@yes,no@:>@], [Enable X11 support @<:@default=yes@:>@])], - [enable_x11=$enableval], - [enable_x11=yes]) - -AC_ARG_ENABLE([glx], - [AC_HELP_STRING([--enable-glx=@<:@auto,yes,no@:>@], [Enable GLX support @<:@default=auto@:>@])], - [enable_glx=$enableval], - [enable_glx=auto]) - -# GLX can be used on different platforms, so we expose a -# configure time switch to enable or disable it; in case -# the "auto" default value is set, we only enable GLX -# support on Linux and Unix -AS_CASE([$enable_glx], - [auto], [ - AS_CASE([$host_os], - [mingw*], [build_glx=no], - [darwin*], [build_glx=no], - [android*], [build_glx=no], - [build_glx=yes]) - ], - - [yes], [ - build_glx=yes - ], - - [no], [ - build_glx=no - ], - - [AC_MSG_ERROR([Invalid value "$enable_glx" for option "--enable-glx"])] -]) - -AC_ARG_ENABLE([egl], - [AC_HELP_STRING([--enable-egl=@<:@auto,yes,no@:>@], [Enable EGL support @<:@default=auto@:>@])], - [enable_egl=$enableval], - [enable_egl=auto]) - -AS_CASE([$enable_egl], - [auto], [ - AS_CASE([$host_os], - [mingw*], [build_egl=no], - [darwin*], [build_egl=no], - [build_egl=yes]) - ], - - [yes], [ - build_egl=yes - ], - - [no], [ - build_egl=no - ], - - [AC_MSG_ERROR([Invalid value "$enable_egl" for option "--enable-egl"])] -]) - -# The remaining platform specific API are enabled depending on the -# platform we're building for -AS_CASE([$host_os], - [mingw*], [ - build_wgl=yes - has_znow=yes - # On windows, the DLL has to have all of its functions - # resolved at link time, so we have to link directly against - # opengl32.dll. But that's the only GL provider, anyway. - EPOXY_LINK_LIBS="-lopengl32" - - # Testing our built windows binaries requires that they be run - # under wine. Yeah, we should be nice and autodetect, but - # there's lots of missing autodetection for the testsuite - # (like checking for EGL and GLX libs in non-windows.). - AC_SUBST([LOG_COMPILER], [wine]) - ], - - [darwin*], [ - build_wgl=no - has_znow=no - EPOXY_LINK_LIBS="" - ], - - [ - build_wgl=no - has_znow=yes - # On platforms with dlopen, we load everything dynamically and - # don't link against a specific window system or GL implementation. - EPOXY_LINK_LIBS="" - ] -) - -AC_SUBST(EPOXY_LINK_LIBS) - -if test x$enable_x11 = xno; then - if test x$enable_glx = xyes; then - AC_MSG_ERROR([GLX support is explicitly enabled, but X11 was disabled]) - fi - build_glx=no -else - AC_DEFINE([ENABLE_X11], [1], [Whether X11 support is enabled]) -fi - -AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes) -if test x$build_egl = xyes; then - PKG_CHECK_MODULES(EGL, [egl]) - AC_DEFINE([BUILD_EGL], [1], [build EGL tests]) - AC_DEFINE(ENABLE_EGL, [1], [Whether EGL support is enabled]) -fi - -AM_CONDITIONAL(BUILD_GLX, test x$build_glx = xyes) -if test x$build_glx = xyes; then - AC_DEFINE([BUILD_GLX], [1], [build GLX tests]) -fi - -AM_CONDITIONAL(BUILD_WGL, test x$build_wgl = xyes) -if test x$build_wgl = xyes; then - AC_DEFINE([BUILD_WGL], [1], [build WGL tests]) -fi - -AM_CONDITIONAL(HAS_ZNOW, test x$has_znow = xyes) - -AC_CHECK_LIB([GLESv1_CM], [glFlush], [has_gles1=yes], [has_gles1=no]) -AM_CONDITIONAL(HAS_GLES1, test x$has_gles1 = xyes) - -AC_CHECK_LIB([dl], [dlopen], [DLOPEN_LIBS="-ldl"]) -AC_SUBST([DLOPEN_LIBS]) - -savelibs=$LIBS -LIBS=$DLOPEN_LIBS -AC_CHECK_FUNCS([dlvsym], [have_dlvsym=1], [have_dlvsym=0]) -AM_CONDITIONAL(HAVE_DLVSYM, test $have_dlvsym = 1) -LIBS=$savelibs - -VISIBILITY_CFLAGS="" -AS_CASE(["$host"], - - [*-*-mingw*], [ - dnl on mingw32 we do -fvisibility=hidden and __declspec(dllexport) - AC_DEFINE([EPOXY_PUBLIC], - [__attribute__((visibility("default"))) __declspec(dllexport) extern], - [defines how to decorate public symbols while building]) - VISIBILITY_CFLAGS="-fvisibility=hidden" - ], - - [ - dnl on other compilers, check if we can do -fvisibility=hidden - SAVED_CFLAGS="${CFLAGS}" - CFLAGS="-fvisibility=hidden" - AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) - AC_TRY_COMPILE([], [int main (void) { return 0; }], [ - AC_MSG_RESULT(yes) - enable_fvisibility_hidden=yes - ], [ - AC_MSG_RESULT(no) - enable_fvisibility_hidden=no - ]) - CFLAGS="${SAVED_CFLAGS}" - - AS_IF([test "${enable_fvisibility_hidden}" = "yes"], [ - AC_DEFINE([EPOXY_PUBLIC], - [__attribute__((visibility("default"))) extern], - [defines how to decorate public symbols while building]) - VISIBILITY_CFLAGS="-fvisibility=hidden" - ]) - ] -) - -AC_SUBST([VISIBILITY_CFLAGS]) - -if test x$enable_x11 = xyes; then - PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) - if test x$x11 = xno -a x$build_glx = xyes; then - AC_MSG_ERROR([libX11 headers (libx11-dev) are required to build with GLX support]) - fi -else - x11=no -fi - -if test x$build_glx = xyes; then - AC_DEFINE(ENABLE_GLX, [1], [Whether GLX support is enabled]) -fi - -AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) - -PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) -PKG_CHECK_MODULES(EGL, [egl], [egl=yes], [egl=no]) - -GL_REQS="" -AS_IF([test x$gl = xyes], [GL_REQS="$GL_REQS gl"]) -AS_IF([test x$build_egl = xyes && test x$egl = xyes], [GL_REQS="$GL_REQS egl"]) -AC_SUBST(GL_REQS) - -# Variables for the pkg-config file; AC_SUBST does not do `test` substitutions, -# so we need to specify the boolean values here -AS_IF([test x$build_glx = xyes], [epoxy_has_glx=1], [epoxy_has_glx=0]) -AS_IF([test x$build_egl = xyes], [epoxy_has_egl=1], [epoxy_has_egl=0]) -AS_IF([test x$build_wgl = xyes], [epoxy_has_wgl=1], [epoxy_has_wgl=0]) -AC_SUBST(epoxy_has_glx) -AC_SUBST(epoxy_has_egl) -AC_SUBST(epoxy_has_wgl) - -AC_CONFIG_FILES([ - epoxy.pc - Makefile - include/epoxy/Makefile - src/Makefile - test/Makefile -]) -AC_OUTPUT - -echo " EGL: $build_egl" -echo " GLX: $build_glx" -echo " WGL: $build_wgl" -echo " PYTHON: $PYTHON" diff --git a/epoxy.pc.in b/epoxy.pc.in deleted file mode 100644 index cdda8d9..0000000 --- a/epoxy.pc.in +++ /dev/null @@ -1,16 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -epoxy_has_glx=@epoxy_has_glx@ -epoxy_has_egl=@epoxy_has_egl@ -epoxy_has_wgl=@epoxy_has_wgl@ - -Name: epoxy -Description: epoxy GL dispatch Library -Version: @PACKAGE_VERSION@ -Cflags: -I${includedir} -Libs: -L${libdir} -lepoxy -Libs.private: @DLOPEN_LIBS@ -Requires.private: @GL_REQS@ diff --git a/include/epoxy/Makefile.am b/include/epoxy/Makefile.am deleted file mode 100644 index 494c96e..0000000 --- a/include/epoxy/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright © 2013 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. - -epoxyincludedir = $(includedir)/epoxy - -epoxyinclude_HEADERS = \ - common.h \ - gl.h \ - $(EGL_INCLUDES) \ - $(GLX_INCLUDES) \ - $(WGL_INCLUDES) \ - $() - -if BUILD_EGL -EGL_INCLUDES = egl.h -endif - -if BUILD_GLX -GLX_INCLUDES = glx.h -endif - -if BUILD_WGL -WGL_INCLUDES = wgl.h -endif diff --git a/meson.build b/meson.build index fe632c5..029798c 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('libepoxy', 'c', version: '1.5.5', 'warning_level=1', ], license: 'MIT', - meson_version: '>= 0.47.0') + meson_version: '>= 0.46.0') epoxy_version = meson.project_version().split('.') epoxy_major_version = epoxy_version[0].to_int() diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 73f7435..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright © 2013 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. - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - $() - -AM_CFLAGS = \ - $(CWARNFLAGS) \ - $(VISIBILITY_CFLAGS) \ - $(X11_CFLAGS) \ - $(EGL_CFLAGS) \ - $() - -epoxyincludedir = $(includedir)/epoxy -lib_LTLIBRARIES = libepoxy.la - -epoxyinclude_DATA = \ - $(GENERATED_GL_INCLUDES) \ - $(INSTALL_GLX_INCLUDES) \ - $(INSTALL_EGL_INCLUDES) \ - $(INSTALL_WGL_INCLUDES) \ - $() - -if BUILD_EGL -INSTALL_EGL_INCLUDES = $(GENERATED_EGL_INCLUDES) -endif - -if BUILD_GLX -INSTALL_GLX_INCLUDES = $(GENERATED_GLX_INCLUDES) -endif - -if BUILD_WGL -INSTALL_WGL_INCLUDES = $(GENERATED_WGL_INCLUDES) -endif - -GENERATED_GL_INCLUDES = \ - $(builddir)/../include/epoxy/gl_generated.h \ - $() - -GENERATED_GLX_INCLUDES = \ - $(builddir)/../include/epoxy/glx_generated.h \ - $() - -GENERATED_EGL_INCLUDES = \ - $(builddir)/../include/epoxy/egl_generated.h \ - $() - -GENERATED_WGL_INCLUDES = \ - $(builddir)/../include/epoxy/wgl_generated.h \ - $() - -GENERATED_GL_SOURCE = gl_generated_dispatch.c - -GENERATED_GL = \ - $(GENERATED_GL_SOURCE) \ - $(GENERATED_GL_INCLUDES) \ - $() - -GENERATED_GLX_SOURCE = glx_generated_dispatch.c - -GENERATED_GLX = \ - $(GENERATED_GLX_SOURCE) \ - $(GENERATED_GLX_INCLUDES) \ - $() - -GENERATED_EGL_SOURCE = egl_generated_dispatch.c - -GENERATED_EGL = \ - $(GENERATED_EGL_SOURCE) \ - $(GENERATED_EGL_INCLUDES) \ - $() - -GENERATED_WGL_SOURCE = wgl_generated_dispatch.c - -GENERATED_WGL = \ - $(GENERATED_WGL_SOURCE) \ - $(GENERATED_WGL_INCLUDES) \ - $() - -BUILT_SOURCES = \ - $(GENERATED_GL) \ - $(GENERATED_GLX) \ - $(GENERATED_EGL) \ - $(GENERATED_WGL) \ - $() -CLEANFILES = $(BUILT_SOURCES) - -libepoxy_la_SOURCES = \ - dispatch_common.c \ - dispatch_common.h \ - $(GENERATED_GL) \ - $(BUILD_EGL_CODE) \ - $(BUILD_GLX_CODE) \ - $(BUILD_WGL_CODE) \ - $() - -libepoxy_la_LDFLAGS = \ - -no-undefined \ - -Bsymbolic-functions \ - $() - -libepoxy_la_LIBADD = \ - $(EPOXY_LINK_LIBS) \ - $(DLOPEN_LIBS) \ - $() - -if BUILD_EGL -BUILD_EGL_CODE = \ - $(GENERATED_EGL) \ - dispatch_egl.c \ - $() -endif - -if BUILD_GLX -BUILD_GLX_CODE = \ - $(GENERATED_GLX) \ - dispatch_glx.c \ - $() -endif - -if BUILD_WGL -BUILD_WGL_CODE = \ - $(GENERATED_WGL) \ - dispatch_wgl.c \ - $() -endif - -# These are generated alongside the .c file. -$(GENERATED_GL_INCLUDES): $(GENERATED_GL_SOURCE) -$(GENERATED_GLX_INCLUDES): $(GENERATED_GLX_SOURCE) -$(GENERATED_EGL_INCLUDES): $(GENERATED_EGL_SOURCE) -$(GENERATED_WGL_INCLUDES): $(GENERATED_WGL_SOURCE) - -$(GENERATED_GL_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/gl.xml - @$(MKDIR_P) $(top_builddir)/include/epoxy - $(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py \ - --srcdir $(top_builddir)/src \ - --includedir $(top_builddir)/include/epoxy \ - $(top_srcdir)/registry/gl.xml - -$(GENERATED_GLX_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/glx.xml - @$(MKDIR_P) $(top_builddir)/include/epoxy - $(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py \ - --srcdir $(top_builddir)/src \ - --includedir $(top_builddir)/include/epoxy \ - $(top_srcdir)/registry/glx.xml - -$(GENERATED_EGL_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/egl.xml - @$(MKDIR_P) $(top_builddir)/include/epoxy - $(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py \ - --srcdir $(top_builddir)/src \ - --includedir $(top_builddir)/include/epoxy \ - $(top_srcdir)/registry/egl.xml - -$(GENERATED_WGL_SOURCE): $(srcdir)/gen_dispatch.py $(top_srcdir)/registry/wgl.xml - @$(MKDIR_P) $(top_builddir)/include/epoxy - $(AM_V_GEN)$(PYTHON) $(srcdir)/gen_dispatch.py \ - --srcdir $(top_builddir)/src \ - --includedir $(top_builddir)/include/epoxy \ - $(top_srcdir)/registry/wgl.xml - -EXTRA_DIST = \ - gen_dispatch.py \ - $() diff --git a/test/.gitignore b/test/.gitignore deleted file mode 100644 index 78919f3..0000000 --- a/test/.gitignore +++ /dev/null @@ -1,24 +0,0 @@ -egl_and_glx_different_pointers_egl -egl_and_glx_different_pointers_egl_glx -egl_and_glx_different_pointers_glx -egl_has_extension_nocontext -egl_gl -egl_gles1_without_glx -egl_gles2_without_glx -glx_alias_prefer_same_name -glx_beginend -glx_gles2 -glx_glxgetprocaddress_nocontext -glx_has_extension_nocontext -glx_public_api -glx_public_api_core -glx_shared_znow -glx_static -headerguards -khronos_typedefs -miscdefines -wgl_core_and_exts -wgl_usefontbitmaps -wgl_usefontbitmaps_unicode -*.log -*.trs diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index fc3ffcd..0000000 --- a/test/Makefile.am +++ /dev/null @@ -1,192 +0,0 @@ -# Copyright © 2013 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. - -EPOXY = $(builddir)/../src/libepoxy.la - -check_LTLIBRARIES = \ - $(EGL_UTIL_LIB) \ - $(GLX_UTIL_LIB) \ - $(WGL_UTIL_LIB) \ - $() - -libegl_common_la_SOURCES = \ - egl_common.c \ - egl_common.h - $() - -libglx_common_la_SOURCES = \ - glx_common.c \ - glx_common.h - $() - -libwgl_common_la_SOURCES = \ - wgl_common.c \ - wgl_common.h - $() -libwgl_common_la_LIBADD = $(EPOXY) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ - $(X11_CFLAGS) \ - $(EGL_CFLAGS) \ - $() - -AM_CFLAGS = $(CWARNFLAGS) - -TESTS = \ - $(EGL_TESTS) \ - $(GLX_TESTS) \ - $(EGL_AND_GLX_TESTS) \ - $(WGL_TESTS) \ - gl_version$(EXEEXT) \ - headerguards$(EXEEXT) \ - miscdefines$(EXEEXT) \ - khronos_typedefs$(EXEEXT) \ - $() - -check_BINARIES = $(EGL_AND_GLX_BIN) - -XFAIL_TESTS = \ - $() - -check_PROGRAMS = $(TESTS) - -if BUILD_EGL -EGL_TESTS = \ - $() - -if HAVE_X11 -EGL_TESTS += \ - egl_has_extension_nocontext \ - egl_epoxy_api \ - egl_gles2_without_glx \ - $() - -if HAS_GLES1 -EGL_TESTS += egl_gles1_without_glx -endif - -EGL_UTIL_LIB = libegl_common.la -endif -endif - -if BUILD_GLX -if HAS_ZNOW -GLX_SHARED_ZNOW = glx_shared_znow -endif - -if BUILD_EGL -if BUILD_GLX -if HAVE_DLVSYM -EGL_AND_GLX_TESTS = \ - egl_gl \ - $() -endif -endif -endif - -if HAVE_DLVSYM -GLX_DLVSYM_TESTS = \ - glx_alias_prefer_same_name \ - glx_gles2 \ - $() -endif - -GLX_TESTS = \ - glx_beginend \ - glx_public_api \ - glx_public_api_core \ - glx_glxgetprocaddress_nocontext \ - glx_has_extension_nocontext \ - glx_static \ - $(GLX_SHARED_ZNOW) \ - $(GLX_DLVSYM_TESTS) \ - $() - -GLX_UTIL_LIB = libglx_common.la -endif - -if BUILD_WGL -WGL_TESTS = \ - wgl_core_and_exts$(EXEEXT) \ - wgl_per_context_funcptrs$(EXEEXT) \ - wgl_usefontbitmaps$(EXEEXT) \ - wgl_usefontbitmaps_unicode$(EXEEXT) \ - $() - -WGL_UTIL_LIB = libwgl_common.la -endif - -egl_has_extension_nocontext_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS) - -egl_epoxy_api_LDADD = $(EPOXY) libegl_common.la $(X11_LIBS) - -egl_gl_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS) - -egl_gles1_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=1 -egl_gles1_without_glx_SOURCES = egl_without_glx.c -egl_gles1_without_glx_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS) - -egl_gles2_without_glx_CPPFLAGS = $(AM_CPPFLAGS) -DGLES_VERSION=2 -egl_gles2_without_glx_SOURCES = egl_without_glx.c -egl_gles2_without_glx_LDADD = $(EPOXY) $(DLOPEN_LIBS) libegl_common.la $(X11_LIBS) - -glx_alias_prefer_same_name_SOURCES = glx_alias_prefer_same_name.c dlwrap.c dlwrap.h -glx_alias_prefer_same_name_LDFLAGS = -rdynamic -glx_alias_prefer_same_name_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) $(DLOPEN_LIBS) - -glx_beginend_LDADD = $(EPOXY) libglx_common.la $(GL_LIBS) $(X11_LIBS) - -glx_gles2_SOURCES = glx_gles2.c dlwrap.c dlwrap.h -glx_gles2_LDFLAGS = -rdynamic -glx_gles2_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) $(DLOPEN_LIBS) - -glx_public_api_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) - -glx_public_api_core_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) - -glx_glxgetprocaddress_nocontext_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) - -glx_has_extension_nocontext_LDADD = $(EPOXY) libglx_common.la $(X11_LIBS) - -glx_static_CFLAGS = -DNEEDS_TO_BE_STATIC -glx_static_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS) -glx_static_LDFLAGS = -static - -glx_shared_znow_SOURCES = glx_static.c -glx_shared_znow_LDADD = $(DLOPEN_LIBS) $(EPOXY) libglx_common.la $(X11_LIBS) -glx_shared_znow_LDFLAGS = -Wl,-z,now - -khronos_typedefs_SOURCES = \ - khronos_typedefs.c \ - khronos_typedefs.h \ - khronos_typedefs_nonepoxy.c \ - $() - -wgl_core_and_exts_LDADD = $(EPOXY) libwgl_common.la -lgdi32 - -wgl_per_context_funcptrs_LDADD = $(EPOXY) libwgl_common.la -lgdi32 - -wgl_usefontbitmaps_LDADD = $(EPOXY) libwgl_common.la -lgdi32 -wgl_usefontbitmaps_unicode_SOURCES = wgl_usefontbitmaps.c -wgl_usefontbitmaps_unicode_LDADD = $(EPOXY) libwgl_common.la -lgdi32 -wgl_usefontbitmaps_unicode_CPPFLAGS = $(AM_CPPFLAGS) -DUNICODE |