From cf821b1af40b0162d9db1c943917e56cfa1b4b72 Mon Sep 17 00:00:00 2001 From: Joshua Moerman Date: Thu, 28 Feb 2013 15:27:34 +0100 Subject: [PATCH] Finally it compiles --- .gitignore | 4 ++++ CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++ main.cpp | 2 +- run | 9 +++++++++ 4 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 CMakeLists.txt create mode 100755 run diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0b740e1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +build +*.sublime-workspace + diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..e45cdf5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 2.8) + +#include(motor/cmake/set_system_include_flag.cmake) +#include(motor/cmake/address_sanitizer.cmake) + + +#include(motor/cmake/enable_gnu11.cmake) + +#include(motor/cmake/warning_settings.cmake) +#get_sane_warning_flags(warnings) + +#include(motor/cmake/join.cmake) +#join("${warnings}" " " warnings) +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${warnings}") + + +project(server) + +add_subdirectory(${PROJECT_SOURCE_DIR}/contrib/libwebsockets/) + + +find_package(Boost 1.48 REQUIRED) +include_directories(${Boost_INCLUDE_DIRS}) + +set(boost ${Boost_LIBRARIES}) + +include_directories("${PROJECT_SOURCE_DIR}") +include_directories(SYSTEM "${PROJECT_SOURCE_DIR}/contrib/libwebsockets/") + +set(all_friggin_libraries ${boost} websockets_shared) + +add_executable(server main.cpp) +target_link_libraries(server ${all_friggin_libraries}) diff --git a/main.cpp b/main.cpp index 6115fd4..4b09e05 100644 --- a/main.cpp +++ b/main.cpp @@ -36,7 +36,7 @@ #include "lws_config.h" #endif -#include "lib/libwebsockets.h" +#include int force_exit = 0; diff --git a/run b/run new file mode 100755 index 0000000..3e5983b --- /dev/null +++ b/run @@ -0,0 +1,9 @@ +#!/bin/bash + +mkdir -p build +cd build +cmake .. +make -j8 +cd .. + +./build/server