diff options
| author | Chris Robinson <[email protected]> | 2012-10-14 01:55:39 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2012-10-14 01:55:39 -0700 |
| commit | f7655d44a266a4eeadd7d14921363594b64ac15f (patch) | |
| tree | fd89151f62f2b17debe8c9f8f5bc74d24fa35fa6 | |
| parent | 38e6bfb7024f73671087da2caae5b952b80a5dab (diff) | |
Move alhelpers and alffmpeg code to a common sub-directory
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | examples/alstream.c | 4 | ||||
| -rw-r--r-- | examples/common/alffmpeg.c (renamed from examples/alffmpeg.c) | 0 | ||||
| -rw-r--r-- | examples/common/alffmpeg.h (renamed from examples/alffmpeg.h) | 0 | ||||
| -rw-r--r-- | examples/common/alhelpers.c (renamed from examples/alhelpers.c) | 0 | ||||
| -rw-r--r-- | examples/common/alhelpers.h (renamed from examples/alhelpers.h) | 0 |
6 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d22077d..822494b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -833,7 +833,9 @@ ENDIF() IF(EXAMPLES) IF(FFMPEG_FOUND) - ADD_EXECUTABLE(alstream examples/alhelpers.c examples/alffmpeg.c examples/alstream.c) + ADD_EXECUTABLE(alstream examples/common/alhelpers.c + examples/common/alffmpeg.c + examples/alstream.c) TARGET_LINK_LIBRARIES(alstream ${FFMPEG_LIBRARIES} ${LIBNAME}) SET_TARGET_PROPERTIES(alstream PROPERTIES COMPILE_FLAGS "${FFMPEG_CFLAGS}") INSTALL(TARGETS alstream diff --git a/examples/alstream.c b/examples/alstream.c index 183d54f2..a8447eae 100644 --- a/examples/alstream.c +++ b/examples/alstream.c @@ -34,8 +34,8 @@ #include "AL/alc.h" #include "AL/alext.h" -#include "alhelpers.h" -#include "alffmpeg.h" +#include "common/alhelpers.h" +#include "common/alffmpeg.h" LPALBUFFERSAMPLESSOFT palBufferSamplesSOFT = wrap_BufferSamples; diff --git a/examples/alffmpeg.c b/examples/common/alffmpeg.c index 16f73866..16f73866 100644 --- a/examples/alffmpeg.c +++ b/examples/common/alffmpeg.c diff --git a/examples/alffmpeg.h b/examples/common/alffmpeg.h index 27e49ab4..27e49ab4 100644 --- a/examples/alffmpeg.h +++ b/examples/common/alffmpeg.h diff --git a/examples/alhelpers.c b/examples/common/alhelpers.c index dbfe2383..dbfe2383 100644 --- a/examples/alhelpers.c +++ b/examples/common/alhelpers.c diff --git a/examples/alhelpers.h b/examples/common/alhelpers.h index eda8925e..eda8925e 100644 --- a/examples/alhelpers.h +++ b/examples/common/alhelpers.h |