Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-14 08:16:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #943 from birarda/master

Browse source 
changes to DS and civetweb
This commit is contained in:
ZappoMan 2013-09-17 10:25:05 -07:00
commit c7f8bded3c
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
domain-server/CMakeLists.txt
View file

@ -10,9 +10,9 @@ setup_hifi_project(${TARGET_NAME} TRUE)
# setup a library for civetweb and link it to the domain-server
FILE(GLOB CIVETWEB_SRCS external/civetweb/src/*.c)
add_library(CIVETWEB ${CIVETWEB_SRCS})
add_library(civetweb ${CIVETWEB_SRCS})
include_directories(external/civetweb/include)
target_link_libraries(${TARGET_NAME} CIVETWEB)
target_link_libraries(${TARGET_NAME} civetweb)
# remove and then copy the files for the webserver
add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
@ -25,4 +25,9 @@ add_custom_command(TARGET ${TARGET_NAME} POST_BUILD
# link the shared hifi library
include(${MACRO_DIR}/LinkHifiLibrary.cmake)
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
link_hifi_library(shared ${TARGET_NAME} ${ROOT_DIR})
# link dl library on UNIX for civetweb
if (UNIX AND NOT APPLE)
target_link_libraries(${TARGET_NAME} ${CMAKE_DL_LIBS})
endif (UNIX AND NOT APPLE)

2
domain-server/src/main.cpp
View file

@ -158,8 +158,6 @@ int main(int argc, const char* argv[]) {
QString documentRoot = QString("%1/resources/web").arg(QCoreApplication::applicationDirPath());
qDebug() << documentRoot << "\n";
// list of options. Last element must be NULL.
const char *options[] = {"listening_ports", "8080",
"document_root", documentRoot.toStdString().c_str(), NULL};