From a7f2d150a49b17fec6f93bd9fa61f778db267a69 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Tue, 24 Jun 2014 20:15:34 -0700 Subject: [PATCH] what's this cmake defines ssize_t??? --- tests/octree/CMakeLists.txt | 5 +++++ tests/octree/src/ModelTests.cpp | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/octree/CMakeLists.txt b/tests/octree/CMakeLists.txt index 33c3bcd4a3..9c5e031d74 100644 --- a/tests/octree/CMakeLists.txt +++ b/tests/octree/CMakeLists.txt @@ -39,6 +39,11 @@ link_hifi_library(fbx ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR}) IF (WIN32) + # add a definition for ssize_t so that windows doesn't bail + add_definitions(-Dssize_t=long) + #target_link_libraries(${TARGET_NAME} Winmm Ws2_32) + target_link_libraries(${TARGET_NAME} wsock32.lib) ENDIF(WIN32) + diff --git a/tests/octree/src/ModelTests.cpp b/tests/octree/src/ModelTests.cpp index b2c0923ef4..2cca4b43f6 100644 --- a/tests/octree/src/ModelTests.cpp +++ b/tests/octree/src/ModelTests.cpp @@ -14,13 +14,6 @@ #include -#ifdef WIN32 -#ifndef ssize_t -#define ssize_t int -#endif -#endif - - #include #include #include