From 0531409611867ae8dad711e52d6534fa634d40cc Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sun, 10 Sep 2017 17:52:32 +0200 Subject: Initial steps towards pugl domination! --- plugingui/Makefile.am | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'plugingui/Makefile.am') diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am index 714b21c..f9d9c09 100644 --- a/plugingui/Makefile.am +++ b/plugingui/Makefile.am @@ -42,6 +42,8 @@ libdggui_la_CPPFLAGS = \ -DLODEPNG_NO_COMPILE_ERROR_TEXT \ -DLODEPNG_NO_COMPILE_CPP +libdggui_la_CFLAGS = + libdggui_la_LIBADD = \ $(GUI_LIBS) $(PTHREAD_LIBS) @@ -110,18 +112,42 @@ nodist_libdggui_la_SOURCES += \ nativewindow_win32.cc endif -if ENABLE_PUGL -nodist_libdggui_la_SOURCES += \ - nativewindow_pugl.cc \ - $(top_srcdir)/pugl/pugl/pugl_x11.c -endif - #if ENABLE_COCOA #nodist_libdggui_la_SOURCES += \ # nativewindow_cocoa.m \ # nativewindow_cocoa.cc #endif +if ENABLE_PUGL_X11 +nodist_libdggui_la_SOURCES += \ + nativewindow_pugl.cc \ + $(top_srcdir)/pugl/pugl/pugl_x11.c + +libdggui_la_CPPFLAGS += \ + -I$(top_srcdir)/pugl + +libdggui_la_CFLAGS += \ + -std=c99 +endif + +if ENABLE_PUGL_WIN32 +nodist_libdggui_la_SOURCES += \ + nativewindow_pugl.cc \ + $(top_srcdir)/pugl/pugl/pugl_win.cpp + +libdggui_la_CPPFLAGS += \ + -I$(top_srcdir)/pugl +endif + +if ENABLE_PUGL_COCOA +nodist_libdggui_la_SOURCES += \ + nativewindow_pugl.cc \ + $(top_srcdir)/pugl/pugl/pugl_osx.m + +libdggui_la_CPPFLAGS += \ + -I$(top_srcdir)/pugl +endif + plugingui_LDADD = libdggui.la $(top_srcdir)/src/libdg.la plugingui_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) \ -- cgit v1.2.3