From 7fb52c529eb31de9e7bfb11288bf64f556816686 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 12 Apr 2013 13:17:10 -0700
Subject: [PATCH] move mixer to audio-mixer, use SetupHifiProject macro

---
 CMakeLists.txt                      |  2 +-
 {mixer => audio-mixer}/.gitignore   |  0
 audio-mixer/CMakeLists.txt          | 15 +++++++++++++++
 {mixer => audio-mixer}/src/main.cpp |  0
 mixer/CMakeLists.txt                | 17 -----------------
 5 files changed, 16 insertions(+), 18 deletions(-)
 rename {mixer => audio-mixer}/.gitignore (100%)
 create mode 100644 audio-mixer/CMakeLists.txt
 rename {mixer => audio-mixer}/src/main.cpp (100%)
 delete mode 100644 mixer/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29931d6793..e33241280a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(hifi)
 add_subdirectory(space)
 add_subdirectory(avatar-mixer)
 add_subdirectory(domain-server)
-add_subdirectory(mixer)
+add_subdirectory(audio-mixer)
 add_subdirectory(voxel)
 add_subdirectory(interface)
 add_subdirectory(injector)
\ No newline at end of file
diff --git a/mixer/.gitignore b/audio-mixer/.gitignore
similarity index 100%
rename from mixer/.gitignore
rename to audio-mixer/.gitignore
diff --git a/audio-mixer/CMakeLists.txt b/audio-mixer/CMakeLists.txt
new file mode 100644
index 0000000000..cbb5075232
--- /dev/null
+++ b/audio-mixer/CMakeLists.txt
@@ -0,0 +1,15 @@
+cmake_minimum_required(VERSION 2.8)
+set(MACRO_DIR ../cmake/macros)
+
+set(TARGET_NAME audio-mixer)
+
+include(${MACRO_DIR}/SetupHifiProject.cmake)
+setup_hifi_project(${TARGET_NAME})
+
+# link the shared hifi library
+include(${MACRO_DIR}/LinkHifiLibrary.cmake)
+link_hifi_library(shared ${TARGET_NAME})
+
+# link the threads library
+find_package(Threads REQUIRED)
+target_link_libraries(${TARGET_NAME} ${CMAKE_THREAD_LIBS_INIT})
\ No newline at end of file
diff --git a/mixer/src/main.cpp b/audio-mixer/src/main.cpp
similarity index 100%
rename from mixer/src/main.cpp
rename to audio-mixer/src/main.cpp
diff --git a/mixer/CMakeLists.txt b/mixer/CMakeLists.txt
deleted file mode 100644
index 0c35fb7871..0000000000
--- a/mixer/CMakeLists.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(mixer)
-
-# grab the implemenation and header files
-file(GLOB MIXER_SRCS src/*.cpp src/*.h)
-
-# add the mixer executable
-add_executable(mixer ${MIXER_SRCS})
-
-# link the shared hifi library
-include(../cmake/macros/LinkHifiLibrary.cmake)
-link_hifi_library(shared mixer)
-
-# link the threads library
-find_package(Threads REQUIRED)
-target_link_libraries(mixer ${CMAKE_THREAD_LIBS_INIT})
\ No newline at end of file