mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 10:17:40 +02:00
put back ssize_t definition
This commit is contained in:
parent
97b67e83c5
commit
f351399d08
16 changed files with 88 additions and 10 deletions
|
@ -30,4 +30,9 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
# link the hifi networking library
|
# link the hifi networking library
|
||||||
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -46,3 +46,8 @@ IF (WIN32)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
|
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -42,4 +42,9 @@ IF (WIN32)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
# link QtNetwork
|
# link QtNetwork
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Network)
|
target_link_libraries(${TARGET_NAME} Qt5::Network)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -285,6 +285,9 @@ else (APPLE)
|
||||||
# we're using static GLEW, so define GLEW_STATIC
|
# we're using static GLEW, so define GLEW_STATIC
|
||||||
add_definitions(-DGLEW_STATIC)
|
add_definitions(-DGLEW_STATIC)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARY}" wsock32.lib opengl32.lib)
|
target_link_libraries(${TARGET_NAME} "${GLEW_LIBRARY}" wsock32.lib opengl32.lib)
|
||||||
endif()
|
endif()
|
||||||
endif (APPLE)
|
endif (APPLE)
|
||||||
|
|
|
@ -28,3 +28,8 @@ link_hifi_library(fbx ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
find_package(ZLIB)
|
find_package(ZLIB)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -21,4 +21,9 @@ include_glm(${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
|
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
|
||||||
link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(shared ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -28,4 +28,9 @@ link_hifi_library(octree ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(voxels ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Script)
|
target_link_libraries(${TARGET_NAME} Qt5::Script)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -29,3 +29,8 @@ find_package(ZLIB)
|
||||||
|
|
||||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -27,4 +27,9 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
include(${MACRO_DIR}/IncludeGLM.cmake)
|
include(${MACRO_DIR}/IncludeGLM.cmake)
|
||||||
include_glm(${TARGET_NAME} "${ROOT_DIR}")
|
include_glm(${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
|
target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -37,4 +37,9 @@ link_hifi_library(metavoxels ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
find_package(ZLIB)
|
find_package(ZLIB)
|
||||||
|
|
||||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -19,4 +19,9 @@ setup_hifi_library(${TARGET_NAME})
|
||||||
include(${MACRO_DIR}/IncludeGLM.cmake)
|
include(${MACRO_DIR}/IncludeGLM.cmake)
|
||||||
include_glm(${TARGET_NAME} "${ROOT_DIR}")
|
include_glm(${TARGET_NAME} "${ROOT_DIR}")
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Network)
|
target_link_libraries(${TARGET_NAME} Qt5::Network)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -28,4 +28,9 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
find_package(ZLIB)
|
find_package(ZLIB)
|
||||||
|
|
||||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -32,3 +32,8 @@ find_package(ZLIB)
|
||||||
|
|
||||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -34,3 +34,8 @@ find_package(ZLIB)
|
||||||
|
|
||||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -30,4 +30,9 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
|
||||||
find_package(ZLIB)
|
find_package(ZLIB)
|
||||||
|
|
||||||
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
include_directories(SYSTEM "${ZLIB_INCLUDE_DIRS}")
|
||||||
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets Qt5::Script)
|
target_link_libraries(${TARGET_NAME} "${ZLIB_LIBRARIES}" Qt5::Widgets Qt5::Script)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
|
@ -38,4 +38,9 @@ IF (WIN32)
|
||||||
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
|
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
target_link_libraries(${TARGET_NAME} Qt5::Script)
|
target_link_libraries(${TARGET_NAME} Qt5::Script)
|
||||||
|
|
||||||
|
# add a definition for ssize_t so that windows doesn't bail
|
||||||
|
if (WIN32)
|
||||||
|
add_definitions(-Dssize_t=long)
|
||||||
|
endif ()
|
Loading…
Reference in a new issue