mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/sgct' into develop

Browse Source
This commit is contained in:
Alexander Bock
2016-07-20 17:10:41 +02:00
parent 2b01b300b5 a0fec7f6a0
commit aedfaeda50
6 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -7,3 +7,6 @@
[submodule "ext/spice"]
path = ext/spice
url = https://github.com/OpenSpace/Spice.git
[submodule "ext/sgct"]
path = ext/sgct
url = https://github.com/opensgct/sgct.git

2
ext/ghoul

Submodule ext/ghoul updated: 60e65350db...8875a9e20d

1
ext/sgct Submodule

Submodule ext/sgct added at 7f97e618d3

4
include/openspace/network/parallelconnection.h
View File

@@ -43,7 +43,7 @@
#include <map>
#include <condition_variable>
#ifdef __WIN32__
#ifdef WIN32
#ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
@@ -52,7 +52,7 @@
#include <ws2tcpip.h>
#endif
#if defined(__WIN32__) || defined(__MING32__) || defined(__MING64__)
#if defined(WIN32) || defined(__MING32__) || defined(__MING64__)
typedef size_t _SOCKET;
#else
typedef int _SOCKET;

4
src/network/parallelconnection.cpp
View File

@@ -22,7 +22,7 @@
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
****************************************************************************************/
#ifdef __WIN32__
#ifdef WIN32
#ifndef _ERRNO
#define _ERRNO WSAGetLastError()
#endif
@@ -148,7 +148,7 @@ void ParallelConnection::closeSocket(){
* SHUT_RDWR (Disables further send and receive operations)
*/
#ifdef __WIN32__
#ifdef WIN32
shutdown(_clientSocket, SD_BOTH);
closesocket(_clientSocket);
#else

29
support/cmake/support_macros.cmake
View File

@@ -116,9 +116,32 @@ function (add_external_dependencies)
set_property(TARGET lz4 PROPERTY FOLDER "External")
# SGCT
find_package(SGCT REQUIRED)
target_include_directories(libOpenSpace SYSTEM PUBLIC ${SGCT_INCLUDE_DIRECTORIES})
target_link_libraries(libOpenSpace ${SGCT_LIBRARIES})
set(SGCT_TEXT OFF CACHE BOOL "" FORCE)
set(SGCT_BUILD_CSHARP_PROJECTS OFF CACHE BOOL "" FORCE)
set(SGCT_LIGHT_ONLY ON CACHE BOOL "" FORCE)
add_subdirectory(${OPENSPACE_EXT_DIR}/sgct)
target_include_directories(libOpenSpace SYSTEM PUBLIC ${OPENSPACE_EXT_DIR}/sgct/include)
target_link_libraries(
libOpenSpace
# sgct
sgct_light glew glfw png16_static quat tinythreadpp tinyxml2static turbojpeg-static
vrpn zlibstatic
${GLFW_LIBRARIES}
)
set_property(TARGET sgct_light PROPERTY FOLDER "External")
set_property(TARGET glew PROPERTY FOLDER "External/SGCT")
set_property(TARGET glfw PROPERTY FOLDER "External/SGCT")
set_property(TARGET png16_static PROPERTY FOLDER "External/SGCT")
set_property(TARGET quat PROPERTY FOLDER "External/SGCT")
set_property(TARGET simd PROPERTY FOLDER "External/SGCT")
set_property(TARGET tinythreadpp PROPERTY FOLDER "External/SGCT")
set_property(TARGET tinyxml2static PROPERTY FOLDER "External/SGCT")
set_property(TARGET turbojpeg-static PROPERTY FOLDER "External/SGCT")
set_property(TARGET vrpn PROPERTY FOLDER "External/SGCT")
set_property(TARGET zlibstatic PROPERTY FOLDER "External/SGCT")
if (UNIX AND (NOT APPLE))
target_link_libraries(libOpenSpace Xcursor Xinerama X11)
endif ()