align includes and Makefiles to directory changes

Origin commit data
------------------
Branch: master
Commit: 52caa02ddc
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-23 (Sun, 23 Dec 2018)

Origin message was:
------------------
- align includes and Makefiles to directory changes

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-12-23 22:33:56 +01:00
committed by max_10
parent 025afdf66c
commit 99793f1362
6 changed files with 15 additions and 15 deletions

View File

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

View File

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

View File

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

View File

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