From f7655d44a266a4eeadd7d14921363594b64ac15f Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Sun, 14 Oct 2012 01:55:39 -0700 Subject: [PATCH] Move alhelpers and alffmpeg code to a common sub-directory --- CMakeLists.txt | 4 +++- examples/alstream.c | 4 ++-- examples/{ => common}/alffmpeg.c | 0 examples/{ => common}/alffmpeg.h | 0 examples/{ => common}/alhelpers.c | 0 examples/{ => common}/alhelpers.h | 0 6 files changed, 5 insertions(+), 3 deletions(-) rename examples/{ => common}/alffmpeg.c (100%) rename examples/{ => common}/alffmpeg.h (100%) rename examples/{ => common}/alhelpers.c (100%) rename examples/{ => common}/alhelpers.h (100%) 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 similarity index 100% rename from examples/alffmpeg.c rename to examples/common/alffmpeg.c diff --git a/examples/alffmpeg.h b/examples/common/alffmpeg.h similarity index 100% rename from examples/alffmpeg.h rename to examples/common/alffmpeg.h diff --git a/examples/alhelpers.c b/examples/common/alhelpers.c similarity index 100% rename from examples/alhelpers.c rename to examples/common/alhelpers.c diff --git a/examples/alhelpers.h b/examples/common/alhelpers.h similarity index 100% rename from examples/alhelpers.h rename to examples/common/alhelpers.h -- 2.11.4.GIT