diff options
Diffstat (limited to 'src/libjin/audio')
-rw-r--r-- | src/libjin/audio/audio.cpp | 8 | ||||
-rw-r--r-- | src/libjin/audio/audio.h | 5 | ||||
-rw-r--r-- | src/libjin/audio/sdl/audio.cpp | 5 | ||||
-rw-r--r-- | src/libjin/audio/sdl/audio.h | 3 | ||||
-rw-r--r-- | src/libjin/audio/sdl/source.cpp | 7 | ||||
-rw-r--r-- | src/libjin/audio/sdl/source.h | 3 | ||||
-rw-r--r-- | src/libjin/audio/source.cpp | 4 | ||||
-rw-r--r-- | src/libjin/audio/source.h | 5 |
8 files changed, 35 insertions, 5 deletions
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 <SDL2/SDL.h> +#include "../modules.h" +#if JIN_MODULES_AUDIO +#include <SDL2/SDL.h> #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 <SDL2/SDL.h> @@ -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 <iostream> #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 <vector> #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 <exception> #include <fstream> @@ -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 <vector> #include <queue> @@ -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 <cstring> #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 <SDL2/SDL.h> @@ -45,4 +47,5 @@ namespace audio } } -#endif
\ No newline at end of file +#endif // JIN_MODULES_AUDIO +#endif
\ No newline at end of file |