From 82b5f07386deef059e5ec24e38c4b3f1c964437d Mon Sep 17 00:00:00 2001
From: Bent Bisballe Nyeng <deva@aasimon.org>
Date: Wed, 16 Mar 2016 20:09:27 +0100
Subject: Build cleanup and windows build add.

---
 plugingui/Makefile.am.plugingui | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'plugingui/Makefile.am.plugingui')

diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui
index f4c0a55..b8b03be 100644
--- a/plugingui/Makefile.am.plugingui
+++ b/plugingui/Makefile.am.plugingui
@@ -1,3 +1,5 @@
+# -*- Makefile -*-
+
 PLUGIN_GUI_SOURCES = \
 	$(top_srcdir)/hugin/hugin.c \
 	$(top_srcdir)/hugin/hugin_syslog.c \
@@ -36,13 +38,15 @@ PLUGIN_GUI_SOURCES = \
 
 PLUGIN_GUI_LIBS = $(GUI_LIBS) $(PTHREAD_LIBS)
 
-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 \
-									-DLODEPNG_NO_COMPILE_ANCILLARY_CHUNKS \
-									-DLODEPNG_NO_COMPILE_ERROR_TEXT \
-									-DLODEPNG_NO_COMPILE_CPP
+PLUGIN_GUI_CPPFLAGS = \
+	$(GUI_CPPFLAGS) -I$(top_srcdir)/hugin \
+	-I$(top_srcdir)/plugingui \
+	-DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) \
+	-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
@@ -54,7 +58,8 @@ endif
 
 if ENABLE_PUGL
 PLUGIN_GUI_SOURCES += \
-									 $(top_srcdir)/plugingui/nativewindow_pugl.cc \
-									 $(top_srcdir)/pugl/pugl/pugl_x11.c
-PLUGIN_GUI_CFLAGS += -I$(top_srcdir)/pugl/pugl
+	$(top_srcdir)/plugingui/nativewindow_pugl.cc \
+	$(top_srcdir)/pugl/pugl/pugl_x11.c
+
+PLUGIN_GUI_CPPFLAGS += -I$(top_srcdir)/pugl/pugl
 endif
-- 
cgit v1.2.3