From fab10ada3ea39d5499272e591cd2d10c2b03eb3f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 12 Feb 2013 17:31:53 -0800 Subject: [PATCH] move shared UDPSocket class to shared dir for reuse in mixer --- CMakeLists.txt | 3 +++ interface/CMakeLists.txt | 5 +++-- {interface => shared}/src/UDPSocket.cpp | 0 {interface => shared}/src/UDPSocket.h | 0 4 files changed, 6 insertions(+), 2 deletions(-) rename {interface => shared}/src/UDPSocket.cpp (100%) rename {interface => shared}/src/UDPSocket.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf6b31ecff..cc2635f36b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,9 @@ set(GLM_ROOT_DIR ${CMAKE_SOURCE_DIR}/external) set(LODEPNG_ROOT_DIR ${CMAKE_SOURCE_DIR}/external/LodePNG) set(PORTAUDIO_DIR ${CMAKE_SOURCE_DIR}/external/portaudio) +set(HIFI_SHARED_DIR ${CMAKE_SOURCE_DIR}/shared/src) +file(GLOB HIFI_SHARED_SRCS ${HIFI_SHARED_DIR}/*.cpp ${HIFI_SHARED_DIR}/*.h) + add_subdirectory(interface) add_subdirectory(domain) add_subdirectory(mixer) \ No newline at end of file diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index ce4ca7f1a4..71b234954b 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -12,9 +12,8 @@ endif (APPLE) configure_file(InterfaceConfig.h.in ${PROJECT_BINARY_DIR}/includes/InterfaceConfig.h) file(GLOB INTERFACE_SRCS src/*.cpp src/*.h) -include_directories(${PROJECT_BINARY_DIR}/includes) -add_executable(interface ${INTERFACE_SRCS}) +add_executable(interface ${INTERFACE_SRCS} ${HIFI_SHARED_SRCS}) find_package(OpenGL REQUIRED) find_package(GLUT REQUIRED) @@ -22,6 +21,8 @@ find_package(GLM REQUIRED) find_package(LodePNG REQUIRED) include_directories( + ${PROJECT_BINARY_DIR}/includes + ${HIFI_SHARED_DIR} ${OPENGL_INCLUDE_DIRS} ${GLUT_INCLUDE_DIRS} ${GLM_INCLUDE_DIRS} diff --git a/interface/src/UDPSocket.cpp b/shared/src/UDPSocket.cpp similarity index 100% rename from interface/src/UDPSocket.cpp rename to shared/src/UDPSocket.cpp diff --git a/interface/src/UDPSocket.h b/shared/src/UDPSocket.h similarity index 100% rename from interface/src/UDPSocket.h rename to shared/src/UDPSocket.h