Remove TUIO server from core library

README

@@ -113,17 +113,12 @@ exception of the following dependencies:
    For orientation tracking
    CMake option: PSMOVE_USE_MADGWICK_AHRS (disabled by default)
 
- - TUIO CPP: Released under the terms of the GNU GPL
-   For the TUIO server example (only in the tuio_server binary)
-   CMake option: PSMOVE_BUILD_TUIO_SERVER (disabled by default)
-
  - PS3EYEDriver: Released under the MIT license, parts based on GPL code
    For interfacing with the PSEye camera on OS X (only in the tracker)
    CMake option: PSMOVE_USE_PS3EYE_DRIVER (disabled by default)
 
 When you enable the Madgwick AHRS algorithm, the resulting library can only
-be used under the terms of the GNU GPL. Same with the TUIO Server, although
-here only the "tuio_server" binary is affected, no the PS Move API library.
+be used under the terms of the GNU GPL.
 
 More information about the third party modules and licenses:
 

contrib/build_scripts/msvc/build_msvc_common.bat

@@ -167,14 +167,14 @@ IF NOT EXIST build mkdir build
 cd build
 
 IF "%MSVC_VERSION%"=="2015" (
-	cmake .. -G "Visual Studio 14 Win64" -DPSMOVE_USE_MADGWICK_AHRS=1 -DPSMOVE_USE_PS3EYE_DRIVER=1 -DPSMOVE_BUILD_OPENGL_EXAMPLES=1 -DPSMOVE_BUILD_TUIO_SERVER=ON -DOpenCV_DIR=./external/opencv/build/ -DSDL2DIR=./external/SDL2/
+	cmake .. -G "Visual Studio 14 Win64" -DPSMOVE_USE_MADGWICK_AHRS=1 -DPSMOVE_USE_PS3EYE_DRIVER=1 -DPSMOVE_BUILD_OPENGL_EXAMPLES=1 -DOpenCV_DIR=./external/opencv/build/ -DSDL2DIR=./external/SDL2/
 	IF !ERRORLEVEL! NEQ 0 (
 		echo Failed to generate PSMoveAPI solution
 		goto Error
 	)	
 ) ELSE (
 	IF "%MSVC_VERSION%" == "2013" (
-		cmake .. -G "Visual Studio 12 Win64" -DPSMOVE_USE_MADGWICK_AHRS=1 -DPSMOVE_USE_PS3EYE_DRIVER=1 -DPSMOVE_BUILD_OPENGL_EXAMPLES=1 -DPSMOVE_BUILD_TUIO_SERVER=ON -DOpenCV_DIR=./external/opencv/build/ -DSDL2DIR=./external/SDL2/
+		cmake .. -G "Visual Studio 12 Win64" -DPSMOVE_USE_MADGWICK_AHRS=1 -DPSMOVE_USE_PS3EYE_DRIVER=1 -DPSMOVE_BUILD_OPENGL_EXAMPLES=1 -DOpenCV_DIR=./external/opencv/build/ -DSDL2DIR=./external/SDL2/
 		IF !ERRORLEVEL! NEQ 0 ( 
 			echo Failed to generate PSMoveAPI solution
 			goto Error

examples/CMakeLists.txt

@@ -7,7 +7,6 @@ include(${ROOT_DIR}/cmake/common.cmake)
 option(PSMOVE_BUILD_EXAMPLES "Build the C examples" ON)
 option(PSMOVE_BUILD_OPENGL_EXAMPLES "Build the OpenGL examples" ON)
 option(PSMOVE_BUILD_TESTS "Build the C tests" ON)
-option(PSMOVE_BUILD_TUIO_SERVER "Build the TUIO server" ON)
 
 include_directories(${MSVC_INCLUDES})
 # C examples
@@ -18,38 +17,6 @@ if(PSMOVE_BUILD_EXAMPLES)
 		set_property(TARGET ${EXAMPLE} PROPERTY FOLDER "Examples") 
     endforeach()
 
-    if(PSMOVE_BUILD_TRACKER AND PSMOVE_BUILD_TUIO_SERVER)
-        include_directories(${ROOT_DIR}/external/TUIO_CPP/TUIO)
-        include_directories(${ROOT_DIR}/external/TUIO_CPP/oscpack)
-        add_executable(tuio_server ${CMAKE_CURRENT_LIST_DIR}/c/tuio_server.cpp
-            external/TUIO_CPP/TUIO/TuioClient.cpp
-            external/TUIO_CPP/TUIO/TuioServer.cpp
-            external/TUIO_CPP/TUIO/TuioTime.cpp
-            external/TUIO_CPP/oscpack/osc/OscTypes.cpp
-            external/TUIO_CPP/oscpack/osc/OscOutboundPacketStream.cpp
-            external/TUIO_CPP/oscpack/osc/OscReceivedElements.cpp
-            external/TUIO_CPP/oscpack/osc/OscPrintReceivedElements.cpp
-            external/TUIO_CPP/oscpack/ip/posix/NetworkingUtils.cpp
-            external/TUIO_CPP/oscpack/ip/posix/UdpSocket.cpp
-            external/TUIO_CPP/oscpack/ip/win32/NetworkingUtils.cpp
-            external/TUIO_CPP/oscpack/ip/win32/UdpSocket.cpp
-            ${MSVC_SRCS})
-        set_target_properties(tuio_server PROPERTIES
-            COMPILE_FLAGS -DOSC_HOST_LITTLE_ENDIAN)
-
-	# MingW does not define WIN32 but tuio sources rely on it being there
-	IF(${CMAKE_SYSTEM_NAME} MATCHES "Windows" AND MINGW)
-		set_target_properties(tuio_server PROPERTIES
-		    COMPILE_FLAGS -DWIN32)
-	ENDIF()
-
-        target_link_libraries(tuio_server psmoveapi psmoveapi_tracker ${MSVC_LIBS})
-		set_property(TARGET tuio_server PROPERTY FOLDER "Utilities") 
-    else()
-        # Disable the TUIO Server if we don't build the tracker
-        set(PSMOVE_BUILD_TUIO_SERVER OFF)
-    endif()
-
     if(PSMOVE_BUILD_TRACKER)
 	# C examples
         foreach(EXAMPLE distance_calibration)
@@ -140,4 +107,3 @@ message("  Additional targets")
 feature_use_info("C example apps:   " PSMOVE_BUILD_EXAMPLES)
 feature_use_info("OpenGL examples:  " PSMOVE_BUILD_OPENGL_EXAMPLES)
 feature_use_info("C test programs:  " PSMOVE_BUILD_TESTS)
-feature_use_info("C++ TUIO server:  " PSMOVE_BUILD_TUIO_SERVER)