Merge remote-tracking branch 'cst-next'

This commit is contained in:
Stefan Seyfried
2016-01-16 12:51:04 +01:00
31 changed files with 148 additions and 119 deletions

View File

@@ -2,11 +2,9 @@ AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include
AM_CPPFLAGS +=\
@HWLIB_CFLAGS@ \
@AVFORMAT_CFLAGS@
-I$(top_srcdir)/src/zapit/include \
@AVFORMAT_CFLAGS@ \
@HWLIB_CFLAGS@
AM_CPPFLAGS += -fno-rtti -fno-exceptions

View File

@@ -5,9 +5,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libconfigfile \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \
$(FREETYPE_CFLAGS)
AM_CPPFLAGS += @HWLIB_CFLAGS@
$(FREETYPE_CFLAGS) \
@HWLIB_CFLAGS@
AM_CPPFLAGS += -fno-rtti -fno-exceptions