Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-12 01:22:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

move voxel to voxel-server, use setup project macro

Browse source
This commit is contained in:
Stephen Birarda 2013-04-12 13:25:59 -07:00
parent 44c2099183
commit 96d3f5a27d
6 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
CMakeLists.txt
View file

@ -2,10 +2,10 @@ cmake_minimum_required(VERSION 2.8)
project(hifi)
add_subdirectory(space-server)
add_subdirectory(avatar-mixer)
add_subdirectory(domain-server)
add_subdirectory(audio-mixer)
add_subdirectory(voxel)
add_subdirectory(domain-server)
add_subdirectory(interface)
add_subdirectory(injector)
add_subdirectory(injector)
add_subdirectory(space-server)
add_subdirectory(voxel-server)

15
voxel-server/CMakeLists.txt Normal file
View file

@ -0,0 +1,15 @@
cmake_minimum_required(VERSION 2.8)
set(TARGET_NAME voxel-server)
set(MACRO_DIR ../cmake/macros)
include(${MACRO_DIR}/SetupHifiProject.cmake)
setup_hifi_project(${TARGET_NAME})
# link in the shared library
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME})
# link in the hifi voxels library
link_hifi_library(voxels ${TARGET_NAME})

0
voxel/src/VoxelAgentData.cpp → voxel-server/src/VoxelAgentData.cpp
View file

0
voxel/src/VoxelAgentData.h → voxel-server/src/VoxelAgentData.h
View file

0
voxel/src/main.cpp → voxel-server/src/main.cpp
View file

14
voxel/CMakeLists.txt
View file

@ -1,14 +0,0 @@
cmake_minimum_required(VERSION 2.8)
project(voxel)
file(GLOB VOXEL_SRCS src/*.cpp src/*.h)
add_executable(voxel ${VOXEL_SRCS})
# link in the shared library
include(../cmake/macros/LinkHifiLibrary.cmake)
link_hifi_library(shared voxel)
# link in the hifi voxels library
link_hifi_library(voxels voxel)