From 2930ae0f9bb77730254e2ba87045474f68500948 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 4 Dec 2013 21:29:25 -0800 Subject: [PATCH] attempt to fix build buster --- libraries/octree-server/src/OctreeServer.cpp | 33 +------------------- libraries/octree-server/src/OctreeServer.h | 2 -- libraries/particle-server/CMakeLists.txt | 5 --- libraries/voxel-server/CMakeLists.txt | 5 --- libraries/voxel-server/src/VoxelServer.h | 1 - 5 files changed, 1 insertion(+), 45 deletions(-) diff --git a/libraries/octree-server/src/OctreeServer.cpp b/libraries/octree-server/src/OctreeServer.cpp index b5d9073d03..8a8766851d 100644 --- a/libraries/octree-server/src/OctreeServer.cpp +++ b/libraries/octree-server/src/OctreeServer.cpp @@ -6,44 +6,13 @@ // Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // - -/*** -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include -#include "VoxelNodeData.h" -#include -#include -#include -#include -#include - -#ifdef _WIN32 -#include "Syssocket.h" -#include "Systime.h" -#else -#include -#include -#include -#endif -***/ - #include #include #include #include +#include "civetweb.h" #include "OctreeServer.h" #include "OctreeServerConsts.h" diff --git a/libraries/octree-server/src/OctreeServer.h b/libraries/octree-server/src/OctreeServer.h index c5ef4981f9..39fb9ee990 100644 --- a/libraries/octree-server/src/OctreeServer.h +++ b/libraries/octree-server/src/OctreeServer.h @@ -17,8 +17,6 @@ #include #include -#include "civetweb.h" - #include "OctreePersistThread.h" #include "OctreeSendThread.h" #include "OctreeServerConsts.h" diff --git a/libraries/particle-server/CMakeLists.txt b/libraries/particle-server/CMakeLists.txt index 1d181b51bd..5e14902f45 100644 --- a/libraries/particle-server/CMakeLists.txt +++ b/libraries/particle-server/CMakeLists.txt @@ -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 diff --git a/libraries/voxel-server/CMakeLists.txt b/libraries/voxel-server/CMakeLists.txt index 67e3168f0f..0db5fc5575 100644 --- a/libraries/voxel-server/CMakeLists.txt +++ b/libraries/voxel-server/CMakeLists.txt @@ -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) diff --git a/libraries/voxel-server/src/VoxelServer.h b/libraries/voxel-server/src/VoxelServer.h index 221857d290..e785d2f65e 100644 --- a/libraries/voxel-server/src/VoxelServer.h +++ b/libraries/voxel-server/src/VoxelServer.h @@ -18,7 +18,6 @@ #include #include -#include "civetweb.h" #include "VoxelServerConsts.h"