[PATCH] tests: only build vertex-clip if egl support is enabled

[Emilio Pozuelo Monfort]

On 19/11/13 22:21, Kristian Høgsberg wrote:
> On Tue, Nov 19, 2013 at 06:09:00PM +0100, Emilio Pozuelo Monfort wrote:
>> And pass the right flags to build it.
> 
> This test case only uses GLfloat, we should be able to figure out a
> way to compile the test with typedef float GLfloat instead.

We could have vertex-clipping.c have:

#ifdef ENABLE_EGL
#include <GLES2/gl2.h>
#else
typedef float GLfloat;
// or #define GLfloat float
#endif

and build/run the vertex tests unconditionally.

Emilio

> 
> Kristian
> 
>> ---
>>  tests/Makefile.am | 9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/Makefile.am b/tests/Makefile.am
>> index 8e08375..e123c18 100644
>> --- a/tests/Makefile.am
>> +++ b/tests/Makefile.am
>> @@ -2,7 +2,7 @@ TESTS = $(shared_tests) $(module_tests) $(weston_tests)
>>  
>>  shared_tests = \
>>  	config-parser.test		\
>> -	vertex-clip.test
>> +	$(vertex_clip_test)
>>  
>>  module_tests =				\
>>  	surface-test.la			\
>> @@ -79,13 +79,20 @@ config_parser_test_LDADD =	\
>>  	$(COMPOSITOR_LIBS)
>>  config_parser_test_SOURCES =	\
>>  	config-parser-test.c
>> +
>> +if ENABLE_EGL
>> +vertex_clip_test = vertex-clip.test
>>  vertex_clip_test_SOURCES =		\
>>  	vertex-clip-test.c		\
>>  	../src/vertex-clipping.c	\
>>  	../src/vertex-clipping.h
>> +vertex_clip_test_CFLAGS =	\
>> +	$(EGL_CFLAGS)
>>  vertex_clip_test_LDADD =	\
>> +	$(EGL_LIBS)		\
>>  	libshared-test.la	\
>>  	-lm -lrt
>> +endif
>>  
>>  weston_test_client_src =		\
>>  	weston-test-client-helper.c	\
>> -- 
>> 1.8.4.rc3
>>
>> _______________________________________________
>> wayland-devel mailing list
>> wayland-devel at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>