From 977b845c3e09a5b51895be81ef7514ae4030f588 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 26 Jul 2018 17:28:08 +0800 Subject: =?UTF-8?q?*=E6=9D=A1=E4=BB=B6=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/audio/audio.cpp | 8 ++++++-- src/libjin/audio/audio.h | 5 ++++- src/libjin/audio/sdl/audio.cpp | 5 +++++ src/libjin/audio/sdl/audio.h | 3 +++ src/libjin/audio/sdl/source.cpp | 7 ++++++- src/libjin/audio/sdl/source.h | 3 +++ src/libjin/audio/source.cpp | 4 ++++ src/libjin/audio/source.h | 5 ++++- 8 files changed, 35 insertions(+), 5 deletions(-) (limited to 'src/libjin/audio') diff --git a/src/libjin/audio/audio.cpp b/src/libjin/audio/audio.cpp index 350af51..363bf4d 100644 --- a/src/libjin/audio/audio.cpp +++ b/src/libjin/audio/audio.cpp @@ -1,5 +1,7 @@ -#include +#include "../modules.h" +#if JIN_MODULES_AUDIO +#include #include "audio.h" namespace jin @@ -8,4 +10,6 @@ namespace audio { } -} \ No newline at end of file +} + +#endif // JIN_MODULES_AUDIO \ No newline at end of file diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h index 239b718..faec4db 100644 --- a/src/libjin/audio/audio.h +++ b/src/libjin/audio/audio.h @@ -1,5 +1,7 @@ #ifndef __JIN_AUDIO_H #define __JIN_AUDIO_H +#include "../modules.h" +#if JIN_MODULES_AUDIO #include @@ -34,10 +36,11 @@ namespace audio virtual ~AudioSystem() {}; SINGLETON(AudioSystem); - + }; } } +#endif // JIN_MODULES_AUDIO #endif \ No newline at end of file diff --git a/src/libjin/audio/sdl/audio.cpp b/src/libjin/audio/sdl/audio.cpp index 4e565dc..47d8cf8 100644 --- a/src/libjin/audio/sdl/audio.cpp +++ b/src/libjin/audio/sdl/audio.cpp @@ -1,3 +1,6 @@ +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO + #include #include "audio.h" #include "source.h" @@ -114,3 +117,5 @@ namespace audio } } + +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO \ No newline at end of file diff --git a/src/libjin/audio/sdl/audio.h b/src/libjin/audio/sdl/audio.h index 83ad255..6da6605 100644 --- a/src/libjin/audio/sdl/audio.h +++ b/src/libjin/audio/sdl/audio.h @@ -1,5 +1,7 @@ #ifndef __JIN_AUDIO_SDL_H #define __JIN_AUDIO_SDL_H +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #include #include "../audio.h" @@ -62,4 +64,5 @@ namespace audio } } +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #endif \ No newline at end of file diff --git a/src/libjin/audio/sdl/source.cpp b/src/libjin/audio/sdl/source.cpp index 51b67e4..0eedbba 100644 --- a/src/libjin/audio/sdl/source.cpp +++ b/src/libjin/audio/sdl/source.cpp @@ -1,3 +1,6 @@ +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO + #include #include @@ -391,4 +394,6 @@ Manager::get()->pushCommand(cmd); \ } } -} \ No newline at end of file +} + +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO \ No newline at end of file diff --git a/src/libjin/audio/sdl/source.h b/src/libjin/audio/sdl/source.h index ff311b6..38f7ec4 100644 --- a/src/libjin/audio/sdl/source.h +++ b/src/libjin/audio/sdl/source.h @@ -1,5 +1,7 @@ #ifndef __JIN_SOURCE_SDL_H #define __JIN_SOURCE_SDL_H +#include "../../modules.h" +#if JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #include #include @@ -110,4 +112,5 @@ namespace audio } } +#endif // JIN_MODULES_AUDIO && JIN_AUDIO_SDLAUDIO #endif \ No newline at end of file diff --git a/src/libjin/audio/source.cpp b/src/libjin/audio/source.cpp index f6da44b..ceb882d 100644 --- a/src/libjin/audio/source.cpp +++ b/src/libjin/audio/source.cpp @@ -1,3 +1,6 @@ +#include "../modules.h" +#if JIN_MODULES_AUDIO + #include #include "source.h" @@ -22,3 +25,4 @@ namespace audio } } +#endif // JIN_MODULES_AUDIO \ No newline at end of file diff --git a/src/libjin/audio/source.h b/src/libjin/audio/source.h index 313ebde..5b9c12b 100644 --- a/src/libjin/audio/source.h +++ b/src/libjin/audio/source.h @@ -1,5 +1,7 @@ #ifndef __JIN_AUDIO_SOURCE_H #define __JIN_AUDIO_SOURCE_H +#include "../modules.h" +#if JIN_MODULES_AUDIO #include @@ -45,4 +47,5 @@ namespace audio } } -#endif \ No newline at end of file +#endif // JIN_MODULES_AUDIO +#endif \ No newline at end of file -- cgit v1.1-26-g67d0