Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 14:12:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

move mixer to audio-mixer, use SetupHifiProject macro

Browse source
This commit is contained in:
Stephen Birarda 2013-04-12 13:17:10 -07:00
parent c2cb7cf397
commit 7fb52c529e
5 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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)

0
mixer/.gitignore → audio-mixer/.gitignore vendored
View file

15
audio-mixer/CMakeLists.txt Normal file
View file

@ -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})

0
mixer/src/main.cpp → audio-mixer/src/main.cpp
View file

17
mixer/CMakeLists.txt
View file

@ -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})