From 8635b98a146ce98e5f35ce0a758f9abcb3c7de4c Mon Sep 17 00:00:00 2001 From: malloc Date: Wed, 3 Oct 2018 16:32:41 -0500 Subject: [PATCH] scroomin bert --- CMakeLists.txt | 10 +++++++--- src/server/hosts/master_client.cpp | 3 ++- src/web/style.css | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 06852dc..e33f50f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,8 +31,8 @@ if(_CMP) set(CMAKE_EXECUTABLE_SUFFIX ".html") file(GLOB_RECURSE client_src - #"src/common/*.hpp" - #"src/common/*.cpp" + "src/common/*.hpp" + "src/common/*.cpp" "src/client/*.hpp" "src/client/*.cpp" ) @@ -42,10 +42,14 @@ if(_CMP) add_custom_command( TARGET client POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy + ${PROJECT_SOURCE_DIR}/src/web/index.html + ${PROJECT_SOURCE_DIR}/src/web/script.js + ${PROJECT_SOURCE_DIR}/src/web/style.css + ${PROJECT_BINARY_DIR} ) target_include_directories(client - #PRIVATE ${PROJECT_SOURCE_DIR}/src/common + PRIVATE ${PROJECT_SOURCE_DIR}/src/common PRIVATE ${PROJECT_SOURCE_DIR}/src/client PRIVATE ${PROJECT_SOURCE_DIR}/include/client) diff --git a/src/server/hosts/master_client.cpp b/src/server/hosts/master_client.cpp index 159bb4f..a200e0f 100644 --- a/src/server/hosts/master_client.cpp +++ b/src/server/hosts/master_client.cpp @@ -7,7 +7,8 @@ static struct { /** MASTERCLIENTPOOL CODE **/ void sosc::MasterClientPool::SetupQueries(Queries *queries) { -#define QRY_ +#define QRY_USER_REGISTER 0 + } /** MASTERCLIENT CODE **/ \ No newline at end of file diff --git a/src/web/style.css b/src/web/style.css index 92816a1..ccd841c 100644 --- a/src/web/style.css +++ b/src/web/style.css @@ -2,8 +2,10 @@ body { padding-top: 36px; font-family: monospace; text-align: center; - background: #000; - color: #fff; + /*background: #000; + color: #fff;*/ + background: #fff; + color: #000; } .hidden {