Module: Demos Branch: master Commit: b8c615394aba872f8e9654f2f14baf74c4ec5b10 URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=b8c615394aba872f8e9654f2f14baf74c4ec5b10
Author: Burlen Loring <[email protected]> Date: Thu Apr 18 17:01:54 2013 -0700 fix build issues. add option for rbug, fix MESA_GLAPI path Signed-off-by: Brian Paul <[email protected]> --- configure.ac | 9 ++++++++- src/rbug/Makefile.am | 2 ++ src/tests/Makefile.am | 2 +- src/tests/getprocaddress.py | 14 ++++++++++---- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 050ac14..30d9c7a 100644 --- a/configure.ac +++ b/configure.ac @@ -234,7 +234,13 @@ AC_ARG_WITH([mesa-source], [mesa_source_enabled="yes" mesa_source_dir="$withval"], [mesa_source_enabled="no"]) -MESA_GLAPI="$mesa_source_dir/src/mesa/glapi" +MESA_GLAPI="$mesa_source_dir/src/mapi/glapi/gen" + +AC_ARG_ENABLE([rbug], + [AS_HELP_STRING([--enable-rbug], + [enable support for rbug @<:@default=no@:>@])], + [rbug_enabled="yes"], + [rbug_enabled="no"]) use_system_data=no AC_ARG_WITH([system-data-files], @@ -301,6 +307,7 @@ AM_CONDITIONAL(HAVE_DRM, test "x$drm_enabled" = "xyes") AM_CONDITIONAL(BUILD_GLTRACE, false) AM_CONDITIONAL(HAVE_MESA_SOURCE, test "x$mesa_source_enabled" = "xyes") AM_CONDITIONAL(HAVE_WAYLAND, test "x$wayland_enabled" = "xyes") +AM_CONDITIONAL(HAVE_RBUG, test "x$rbug_enabled" = "xyes") AC_OUTPUT([ Makefile diff --git a/src/rbug/Makefile.am b/src/rbug/Makefile.am index ae703d8..1f3db5f 100644 --- a/src/rbug/Makefile.am +++ b/src/rbug/Makefile.am @@ -22,6 +22,7 @@ # Authors: # Eric Anholt <[email protected]> +if HAVE_RBUG if HAVE_MESA_SOURCE noinst_PROGRAMS = \ bin_to_bmp \ @@ -35,6 +36,7 @@ noinst_PROGRAMS = \ tex_info \ tex_dump endif +endif EXTRA_DIST = \ README diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 2c94f47..fccff1a 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -42,7 +42,7 @@ nodist_getprocaddress_SOURCES = \ getproclist.h getproclist.h: $(MESA_GLAPI)/gl_API.xml getprocaddress.c getprocaddress.py - python getprocaddress.py > getproclist.h + python getprocaddress.py $(MESA_GLAPI) > getproclist.h BUILT_SOURCES = \ getproclist.h diff --git a/src/tests/getprocaddress.py b/src/tests/getprocaddress.py index c421f90..9f80ff6 100644 --- a/src/tests/getprocaddress.py +++ b/src/tests/getprocaddress.py @@ -3,14 +3,20 @@ # Helper for the getprocaddress.c test. -glapi_xml_path = "../../src/mapi/glapi/gen/" -import sys, getopt, re +import sys, getopt, re, os +argc = len(sys.argv) +if (argc): + glapi_xml_path = sys.argv[1] +else: + glapi_xml_path = "../../src/mapi/glapi/gen/" + sys.path.append(glapi_xml_path) import gl_XML import license + def FindTestFunctions(): """Scan getprocaddress.c for lines that start with "test_" to find extension function tests. Return a list of names found.""" @@ -47,7 +53,7 @@ struct name_test_pair { const char *name; GLboolean (*test)(generic_func); }; - + static struct name_test_pair functions[] = {""" def printBody(self, api): @@ -76,7 +82,7 @@ static struct name_test_pair functions[] = {""" if __name__ == '__main__': - file_name = glapi_xml_path + "gl_API.xml" + file_name = os.path.join(glapi_xml_path, "gl_API.xml") try: (args, trail) = getopt.getopt(sys.argv[1:], "f:") _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
