diff options
author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-12-20 17:24:31 +0100 |
---|---|---|
committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-12-20 17:24:31 +0100 |
commit | 64e5faf11c22c8aabf181288293c8ec7964c213d (patch) | |
tree | f0669001e9eef2aa883df85f401947d843f684b4 /plugingui | |
parent | b697682bd3c1b9cdfde97cd6a7c9d0f10103f6b4 (diff) | |
parent | 0fa481dabf620181c852f43923a3c4b049294ab4 (diff) |
Merge remote-tracking branch 'origin/master' into uirefactor
Diffstat (limited to 'plugingui')
-rw-r--r-- | plugingui/Makefile.am.plugingui | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index 62ddd19..b4baccd 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -32,9 +32,9 @@ PLUGIN_GUI_SOURCES = \ $(top_srcdir)/plugingui/resource_data.cc \ $(top_srcdir)/plugingui/lodepng/lodepng.cpp -PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS) $(ZLIB_LIBS) +PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS) -PLUGIN_GUI_CFLAGS = $(GUI_CFLAGS) $(ZLIB_CFLAGS) -I$(top_srcdir)/hugin \ +PLUGIN_GUI_CFLAGS = $(GUI_CFLAGS) -I$(top_srcdir)/hugin \ -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \ -DLODEPNG_NO_COMPILE_ENCODER \ -DLODEPNG_NO_COMPILE_DISK \ |