diff options
| author | Robert Bragg <robert@linux.intel.com> | 2014-02-09 03:42:07 +0000 |
|---|---|---|
| committer | Robert Bragg <robert@linux.intel.com> | 2014-02-20 18:15:11 +0000 |
| commit | 9ead6be19cb4f397edc31ccde7dc199ac33b6f0e (patch) | |
| tree | b1d06f70d54b651b0aa9e145ad913af5ccdfc46f | |
| parent | d2a2f70f81a4a61abdb1870baff4db75015b4241 (diff) | |
| download | cogl-9ead6be19cb4f397edc31ccde7dc199ac33b6f0e.tar.gz | |
standalone: Fix building standalone
This fixes a few build issues with compiling Cogl against our internal
deps/glib and deps/gmodule libraries.
| -rw-r--r-- | tests/conform/Makefile.am | 13 | ||||
| -rw-r--r-- | tests/conform/test-conform-main.c | 2 | ||||
| -rw-r--r-- | tests/unit/Makefile.am | 5 |
3 files changed, 8 insertions, 12 deletions
diff --git a/tests/conform/Makefile.am b/tests/conform/Makefile.am index edfe940d..ccbf5d88 100644 --- a/tests/conform/Makefile.am +++ b/tests/conform/Makefile.am @@ -69,7 +69,7 @@ test_sources = \ test-texture-rg.c \ $(NULL) -if !USING_EMSCRIPTEN +if USE_GLIB # test-fence depends on the glib mainloop so it won't compile if using # emscripten which builds in standalone mode. test_sources += test-fence.c @@ -132,10 +132,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/cogl \ -I$(top_srcdir)/test-fixtures -if !USE_GLIB -AM_CPPFLAGS += -I$(top_builddir)/deps/glib -endif - AM_CPPFLAGS += \ -DCOGL_DISABLE_DEPRECATED \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" @@ -145,12 +141,13 @@ test_conformance_LDADD = \ $(COGL_DEP_LIBS) \ $(top_builddir)/cogl/libcogl2.la \ $(LIBM) -if !USE_GLIB -test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la -endif if BUILD_COGL_PATH test_conformance_LDADD += $(top_builddir)/cogl-path/libcogl-path.la endif +if !USE_GLIB +test_conformance_LDADD += $(top_builddir)/deps/glib/libglib.la +test_conformance_LDADD += $(top_builddir)/deps/gmodule/libgmodule.la +endif test_conformance_LDFLAGS = -export-dynamic test: wrappers diff --git a/tests/conform/test-conform-main.c b/tests/conform/test-conform-main.c index c119d79b..0cbaf09d 100644 --- a/tests/conform/test-conform-main.c +++ b/tests/conform/test-conform-main.c @@ -147,7 +147,9 @@ main (int argc, char **argv) ADD_TEST (test_euler_quaternion, 0, 0); ADD_TEST (test_color_hsl, 0, 0); +#ifdef COGL_HAS_GLIB_SUPPORT ADD_TEST (test_fence, TEST_REQUIREMENT_FENCE, 0); +#endif ADD_TEST (test_texture_no_allocate, 0, 0); diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 95024721..e9ca43ed 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -60,10 +60,6 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/test-fixtures \ -I$(top_builddir)/cogl -if !USE_GLIB -AM_CPPFLAGS += -I$(top_builddir)/deps/glib -endif - AM_CPPFLAGS += \ -DCOGL_DISABLE_DEPRECATED \ -DTESTS_DATADIR=\""$(top_srcdir)/tests/data"\" \ @@ -76,6 +72,7 @@ test_unit_LDADD = \ $(LIBM) if !USE_GLIB test_unit_LDADD += $(top_builddir)/deps/glib/libglib.la +test_unit_LDADD += $(top_builddir)/deps/gmodule/libgmodule.la endif test_unit_LDFLAGS = -export-dynamic |