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

Merge branch 'master' of https://github.com/worklist/hifi into 19483

Browse source
This commit is contained in:
stojce 2014-01-20 21:44:03 +01:00
commit 35a8dfdab5
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libraries/embedded-webserver/src/HTTPConnection.h
View file

@ -13,6 +13,7 @@
#ifndef __hifi__HTTPConnection__ #ifndef __hifi__HTTPConnection__
#define __hifi__HTTPConnection__ #define __hifi__HTTPConnection__
#include <QDataStream>
#include <QHash> #include <QHash>
#include <QHostAddress> #include <QHostAddress>
#include <QIODevice> #include <QIODevice>

5
libraries/octree-server/CMakeLists.txt
View file

@ -8,13 +8,14 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../../cm
set(TARGET_NAME octree-server) set(TARGET_NAME octree-server)
find_package(Qt5Network REQUIRED)
find_package(Qt5Widgets REQUIRED) find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/SetupHifiLibrary.cmake) include(${MACRO_DIR}/SetupHifiLibrary.cmake)
setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS}) setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
qt5_use_modules(${TARGET_NAME} Widgets) qt5_use_modules(${TARGET_NAME} Network Widgets)
include(${MACRO_DIR}/IncludeGLM.cmake) include(${MACRO_DIR}/IncludeGLM.cmake)
include_glm(${TARGET_NAME} ${ROOT_DIR}) include_glm(${TARGET_NAME} ${ROOT_DIR})
@ -32,4 +33,4 @@ link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(octree ${TARGET_NAME} ${ROOT_DIR})
# link the embedded webserver # link the embedded webserver
link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR}) link_hifi_library(embedded-webserver ${TARGET_NAME} ${ROOT_DIR})