From 58298984d35520bfe38697b2395158711b4e8124 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 10 Apr 2014 09:48:47 -0700
Subject: [PATCH] link GnuTLS to the assignment-client, fix timeval in
SharedUtil
---
assignment-client/CMakeLists.txt | 5 ++++-
libraries/shared/src/SharedUtil.cpp | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/assignment-client/CMakeLists.txt b/assignment-client/CMakeLists.txt
index fa8d23051a..4930c2ace1 100644
--- a/assignment-client/CMakeLists.txt
+++ b/assignment-client/CMakeLists.txt
@@ -34,6 +34,9 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
+find_package(GnuTLS REQUIRED)
+include_directories("${GNUTLS_INCLUDE_DIR}")
+
if (UNIX)
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
endif (UNIX)
@@ -42,4 +45,4 @@ IF (WIN32)
target_link_libraries(${TARGET_NAME} Winmm Ws2_32)
ENDIF(WIN32)
-target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script)
\ No newline at end of file
+target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")
\ No newline at end of file
diff --git a/libraries/shared/src/SharedUtil.cpp b/libraries/shared/src/SharedUtil.cpp
index 0eecd00333..7be21dfb52 100644
--- a/libraries/shared/src/SharedUtil.cpp
+++ b/libraries/shared/src/SharedUtil.cpp
@@ -15,7 +15,7 @@
#include <cctype>
#include <time.h>
-#ifdef _WIN32
+#ifdef WIN32
#ifndef _timeval_
#define _timeval_
#endif