brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build the sdl examples when glib is disabled

Browse Source 
This SDL example were unnecessarily including <glib.h> but they don't
actually depend on glib so now they are built even if Cogl is being
built with --disable-glib.

(cherry picked from commit 1d3bce7f68b0a6885c10a29cd9836a3541a1b653)
This commit is contained in:
Robert Bragg 2012-09-18 16:44:20 +01:00
parent 41f443971c
commit 04ec48ca53
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
examples/Makefile.am
View File

@ -60,6 +60,18 @@ cogland_LDADD = $(common_ldadd)
endif endif
endif endif
cogl_gles2_context_SOURCES = cogl-gles2-context.c
cogl_gles2_context_LDADD = $(common_ldadd)
if BUILD_COGL_GLES2
programs += cogl-gles2-gears
cogl_gles2_gears_SOURCES = cogl-gles2-gears.c
cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS)
cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la
endif
endif #USE_GLIB
if SUPPORT_SDL if SUPPORT_SDL
programs += cogl-sdl-hello programs += cogl-sdl-hello
cogl_sdl_hello_SOURCES = cogl-sdl-hello.c cogl_sdl_hello_SOURCES = cogl-sdl-hello.c
@ -72,17 +84,6 @@ cogl_sdl2_hello_SOURCES = cogl-sdl2-hello.c
cogl_sdl2_hello_LDADD = $(common_ldadd) cogl_sdl2_hello_LDADD = $(common_ldadd)
endif endif
cogl_gles2_context_SOURCES = cogl-gles2-context.c
cogl_gles2_context_LDADD = $(common_ldadd)
if BUILD_COGL_GLES2
programs += cogl-gles2-gears
cogl_gles2_gears_SOURCES = cogl-gles2-gears.c
cogl_gles2_gears_CFLAGS = -I$(top_srcdir)/cogl-gles2 $(AM_CFLAGS)
cogl_gles2_gears_LDADD = $(common_ldadd) $(top_builddir)/cogl-gles2/libcogl-gles2.la
endif
endif #USE_GLIB
if INSTALL_EXAMPLES if INSTALL_EXAMPLES
bin_PROGRAMS = $(programs) bin_PROGRAMS = $(programs)

1
examples/cogl-sdl-hello.c
View File

@ -1,5 +1,4 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <SDL.h> #include <SDL.h>

1
examples/cogl-sdl2-hello.c
View File

@ -1,5 +1,4 @@
#include <cogl/cogl.h> #include <cogl/cogl.h>
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <SDL.h> #include <SDL.h>