- align includes and Makefiles to directory changes

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-12-23 22:33:56 +01:00
committed by Thilo Graf
parent 335dbdd2ea
commit 2ad621326b
6 changed files with 15 additions and 15 deletions

View File

@@ -10,12 +10,12 @@
#elif HAVE_ARM_HARDWARE #elif HAVE_ARM_HARDWARE
#include "../libarmbox/audio_lib.h" #include "../libarmbox/audio_lib.h"
#elif HAVE_AZBOX_HARDWARE #elif HAVE_AZBOX_HARDWARE
#include "../azbox/audio_lib.h" #include "../libazbox/audio_lib.h"
#elif HAVE_GENERIC_HARDWARE #elif HAVE_GENERIC_HARDWARE
#if BOXMODEL_RASPI #if BOXMODEL_RASPI
#include "../raspi/audio_lib.h" #include "../libraspi/audio_lib.h"
#else #else
#include "../generic-pc/audio_lib.h" #include "../libgeneric-pc/audio_lib.h"
#endif #endif
#else #else
#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

View File

@@ -12,15 +12,15 @@
#include "../libarmbox/playback_libeplayer3.h" #include "../libarmbox/playback_libeplayer3.h"
#endif #endif
#elif HAVE_AZBOX_HARDWARE #elif HAVE_AZBOX_HARDWARE
#include "../azbox/playback_lib.h" #include "../libazbox/playback_lib.h"
#elif HAVE_GENERIC_HARDWARE #elif HAVE_GENERIC_HARDWARE
#if BOXMODEL_RASPI #if BOXMODEL_RASPI
#include "../raspi/playback_lib.h" #include "../libraspi/playback_lib.h"
#else #else
#if ENABLE_GSTREAMER #if ENABLE_GSTREAMER
#include "../generic-pc/playback_gst.h" #include "../libgeneric-pc/playback_gst.h"
#else #else
#include "../generic-pc/playback_lib.h" #include "../libgeneric-pc/playback_lib.h"
#endif #endif
#endif #endif
#else #else

View File

@@ -8,12 +8,12 @@
#elif HAVE_ARM_HARDWARE #elif HAVE_ARM_HARDWARE
#include "../libarmbox/record_lib.h" #include "../libarmbox/record_lib.h"
#elif HAVE_AZBOX_HARDWARE #elif HAVE_AZBOX_HARDWARE
#include "../azbox/record_lib.h" #include "../libazbox/record_lib.h"
#elif HAVE_GENERIC_HARDWARE #elif HAVE_GENERIC_HARDWARE
#if BOXMODEL_RASPI #if BOXMODEL_RASPI
#include "../raspi/record_lib.h" #include "../libraspi/record_lib.h"
#else #else
#include "../generic-pc/record_lib.h" #include "../libgeneric-pc/record_lib.h"
#endif #endif
#else #else
#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

View File

@@ -9,12 +9,12 @@
#include "../libarmbox/video_lib.h" #include "../libarmbox/video_lib.h"
#include "../libarmbox/hdmi_cec.h" #include "../libarmbox/hdmi_cec.h"
#elif HAVE_AZBOX_HARDWARE #elif HAVE_AZBOX_HARDWARE
#include "../azbox/video_lib.h" #include "../libazbox/video_lib.h"
#elif HAVE_GENERIC_HARDWARE #elif HAVE_GENERIC_HARDWARE
#if BOXMODEL_RASPI #if BOXMODEL_RASPI
#include "../raspi/video_lib.h" #include "../libraspi/video_lib.h"
#else #else
#include "../generic-pc/video_lib.h" #include "../libgeneric-pc/video_lib.h"
#endif #endif
#else #else
#error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined #error neither HAVE_TRIPLEDRAGON nor HAVE_SPARK_HARDWARE defined

View File

@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libduckbox.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libeplayer3/include -I$(top_srcdir)/libeplayer3-sh4/include
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing

View File

@@ -3,7 +3,7 @@ noinst_LTLIBRARIES = libspark.la
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/common \ -I$(top_srcdir)/common \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/libeplayer3/include -I$(top_srcdir)/libeplayer3-sh4/include
AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing AM_CXXFLAGS = -fno-rtti -fno-exceptions -fno-strict-aliasing
AM_LDFLAGS = \ AM_LDFLAGS = \