diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-11-20 22:21:17 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-11-20 22:21:17 +0100 |
| commit | 3156e03a20cd1ea24b250b46fbaa3f1ad5289450 (patch) | |
| tree | 4d896c1501a464b755636e0bfa819aed0443344a /plugingui | |
| parent | fe412ea187ac6762ac48b0caf2c5bd873f6b9d76 (diff) | |
Make plugingui Makefile.am platform independent.
Diffstat (limited to 'plugingui')
| -rw-r--r-- | plugingui/Makefile.am | 4 | ||||
| -rw-r--r-- | plugingui/Makefile.am.plugingui | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 00b0881..3a2b6f6 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -1,7 +1,6 @@ noinst_PROGRAMS = plugingui rcgen include Makefile.am.plugingui -#include $(top_srcdir)/src/Makefile.am.drumgizmo plugingui_LDADD = $(SNDFILE_LIBS) $(PTHREAD_LIBS) $(EXPAT_LIBS) \ -ldl $(PLUGIN_GUI_LIBS) @@ -57,5 +56,4 @@ EXTRA_DIST = \ verticalline.h \ widget.h \ window.h \ - lodepng/lodepng.h - + lodepng/lodepng.h
\ No newline at end of file diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index 38855d2..3f2e15d 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -1,11 +1,6 @@ - -puglsources = - PLUGIN_GUI_SOURCES = \ $(top_srcdir)/hugin/hugin.c \ $(top_srcdir)/hugin/hugin_syslog.c \ - $(puglsources) \ - $(top_srcdir)/plugingui/nativewindow_x11.cc \ $(top_srcdir)/plugingui/plugingui.cc \ $(top_srcdir)/plugingui/label.cc \ $(top_srcdir)/plugingui/eventhandler.cc \ @@ -41,9 +36,21 @@ PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS) $(ZLIB_LIBS) PLUGIN_GUI_CFLAGS = $(GUI_CFLAGS) $(ZLIB_CFLAGS) -I$(top_srcdir)/hugin \ -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \ - -I$(top_srcdir)/pugl/pugl \ -DLODEPNG_NO_COMPILE_ENCODER \ -DLODEPNG_NO_COMPILE_DISK \ -DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \ -DLODEPNG_NO_COMPILE_ERROR_TEXT \ -DLODEPNG_NO_COMPILE_CPP + +if ENABLE_X11 +PLUGIN_GUI_SOURCES += $(top_srcdir)/plugingui/nativewindow_x11.cc +endif + +if ENABLE_WIN32 +PLUGIN_GUI_SOURCES += $(top_srcdir)/plugingui/nativewindow_win32.cc +endif + +if ENABLE_PUGL +PLUGIN_GUI_SOURCES += $(top_srcdir)/plugingui/nativewindow_pugl.cc +PLUGIN_GUI_CFLAGS += -I$(top_srcdir)/pugl/pugl +endif |