Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 22:44:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

link GnuTLS to the assignment-client, fix timeval in SharedUtil

Browse source
This commit is contained in:
Stephen Birarda 2014-04-10 09:48:47 -07:00
parent 1d5644a85f
commit 58298984d3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/CMakeLists.txt
View file

@ -34,6 +34,9 @@ link_hifi_library(networking ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(script-engine ${TARGET_NAME} "${ROOT_DIR}")
link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}") link_hifi_library(embedded-webserver ${TARGET_NAME} "${ROOT_DIR}")
find_package(GnuTLS REQUIRED)
include_directories("${GNUTLS_INCLUDE_DIR}")
if (UNIX) if (UNIX)
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS}) target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
endif (UNIX) endif (UNIX)
@ -42,4 +45,4 @@ 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::Network Qt5::Widgets Qt5::Script) target_link_libraries(${TARGET_NAME} Qt5::Network Qt5::Widgets Qt5::Script "${GNUTLS_LIBRARY}")

2
libraries/shared/src/SharedUtil.cpp
View file

@ -15,7 +15,7 @@
#include <cctype> #include <cctype>
#include <time.h> #include <time.h>
#ifdef _WIN32 #ifdef WIN32
#ifndef _timeval_ #ifndef _timeval_
#define _timeval_ #define _timeval_
#endif #endif