TEMPORARY hack: link against Gui libs to get gthread and glib
** please undo this change when we are ready to use our own thread service!
This commit is contained in:
parent
af8d70c2bc
commit
8ec25c1f45
2 changed files with 4 additions and 2 deletions
|
|
@ -18,7 +18,7 @@
|
|||
lumiera_srcdir = $(top_srcdir)/src/lumiera
|
||||
|
||||
bin_PROGRAMS += lumiera
|
||||
lumiera_CPPFLAGS = $(AM_CPPFLAGS)
|
||||
lumiera_CPPFLAGS = $(AM_CPPFLAGS) $(LUMIERA_GUI_CFLAGS)
|
||||
lumiera_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Werror
|
||||
lumiera_CXXFLAGS = $(AM_CXXFLAGS) -Wall -Wextra
|
||||
|
||||
|
|
@ -28,6 +28,7 @@ lumiera_LDADD = \
|
|||
liblumieraproc.la \
|
||||
liblumiera.la \
|
||||
$(LUMIERA_PLUGIN_LIBS) \
|
||||
$(LUMIERA_GUI_LIBS) \
|
||||
$(NOBUGMT_LUMIERA_LIBS) \
|
||||
-lboost_program_options-mt \
|
||||
-lboost_regex-mt
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
testlib_srcdir = $(top_srcdir)/tests/lib
|
||||
|
||||
check_PROGRAMS += test-lib
|
||||
test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir)
|
||||
test_lib_CPPFLAGS = $(AM_CPPFLAGS) -Wall -I$(testlib_srcdir) $(LUMIERA_GUI_CFLAGS)
|
||||
|
||||
test_lib_LDADD = \
|
||||
liblumiprocmobjectbuilder.la \
|
||||
|
|
@ -32,6 +32,7 @@ test_lib_LDADD = \
|
|||
liblumierabackend.la \
|
||||
liblumieracommon.la \
|
||||
liblumiera.la \
|
||||
$(LUMIERA_GUI_LIBS) \
|
||||
$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
|
||||
|
||||
test_lib_SOURCES = \
|
||||
|
|
|
|||
Loading…
Reference in a new issue