Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

attempt to fix build buster

Browse source
This commit is contained in:
ZappoMan 2013-12-04 21:29:25 -08:00
parent 33b3cbaa43
commit 2930ae0f9b
5 changed files with 1 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libraries/octree-server/src/OctreeServer.cpp
View file

@ -6,44 +6,13 @@
// Copyright (c) 2013 HighFidelity, Inc. All rights reserved.
//
/***
#include <cmath>
#include <cstdlib>
#include <cstring>
#include <cstdio>
#include <time.h>
#include <QtCore/QDebug>
#include <QtCore/QString>
#include <OctalCode.h>
#include <NodeList.h>
#include <NodeTypes.h>
#include <VoxelTree.h>
#include "VoxelNodeData.h"
#include <SharedUtil.h>
#include <PacketHeaders.h>
#include <SceneUtils.h>
#include <PerfStat.h>
#include <JurisdictionSender.h>
#ifdef _WIN32
#include "Syssocket.h"
#include "Systime.h"
#else
#include <sys/time.h>
#include <arpa/inet.h>
#include <ifaddrs.h>
#endif
***/
#include <QtCore/QTimer>
#include <QtCore/QUuid>
#include <Logging.h>
#include <UUID.h>
#include "civetweb.h"
#include "OctreeServer.h"
#include "OctreeServerConsts.h"

2
libraries/octree-server/src/OctreeServer.h
View file

@ -17,8 +17,6 @@
#include <ThreadedAssignment.h>
#include <EnvironmentData.h>
#include "civetweb.h"
#include "OctreePersistThread.h"
#include "OctreeSendThread.h"
#include "OctreeServerConsts.h"

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

@ -12,13 +12,8 @@ find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/SetupHifiLibrary.cmake)
# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS
FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*)
setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
include_directories(${ROOT_DIR}/externals/civetweb/include)
qt5_use_modules(${TARGET_NAME} Widgets)
# inluce GLM

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

@ -12,13 +12,8 @@ find_package(Qt5Widgets REQUIRED)
include(${MACRO_DIR}/SetupHifiLibrary.cmake)
# grab cJSON and civetweb sources to pass as OPTIONAL_SRCS
FILE(GLOB OPTIONAL_SRCS ${ROOT_DIR}/externals/civetweb/src/*)
setup_hifi_library(${TARGET_NAME} ${OPTIONAL_SRCS})
include_directories(${ROOT_DIR}/externals/civetweb/include)
qt5_use_modules(${TARGET_NAME} Widgets)
include(${MACRO_DIR}/IncludeGLM.cmake)

1
libraries/voxel-server/src/VoxelServer.h
View file

@ -18,7 +18,6 @@
#include <EnvironmentData.h>
#include <OctreeServer.h>
#include "civetweb.h"
#include "VoxelServerConsts.h"