From 329c9209b2d0a9aa6e508cd4f042d5325b389468 Mon Sep 17 00:00:00 2001 From: malloc Date: Fri, 13 Apr 2018 12:21:48 -0500 Subject: [PATCH] test sqlite --- .gitmodules | 3 +++ server/CMakeLists.txt | 4 +++- server/src/db/sqlite | 1 + server/src/main.cpp | 2 +- server/src/sock/pool.hpp | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 .gitmodules create mode 160000 server/src/db/sqlite diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..22c712c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "server/src/db/sqlite"] + path = server/src/db/sqlite + url = https://github.com/MallocNull/sqlite-amalgam diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 8020f86..545177f 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -1,9 +1,11 @@ cmake_minimum_required(VERSION 2.6) -project(server) +project(server) file(GLOB_RECURSE server_src "src/*.hpp" "src/*.cpp" + "src/*.c" + "src/*.h" ) if(CMAKE_COMPILER_IS_GNUCXX) diff --git a/server/src/db/sqlite b/server/src/db/sqlite new file mode 160000 index 0000000..24cc363 --- /dev/null +++ b/server/src/db/sqlite @@ -0,0 +1 @@ +Subproject commit 24cc3639a7a16f99fb12bbd6b0d0d835b3bfcda1 diff --git a/server/src/main.cpp b/server/src/main.cpp index 5786436..88b0ff6 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -15,7 +15,7 @@ #include "sock/scapesock.hpp" #include "sock/pool.hpp" -class User; +class User; class Test : sosc::Pool { protected: void ProcessClient(User* client) override; diff --git a/server/src/sock/pool.hpp b/server/src/sock/pool.hpp index 19ab56f..a3d9295 100644 --- a/server/src/sock/pool.hpp +++ b/server/src/sock/pool.hpp @@ -79,7 +79,7 @@ void Pool::Start() { this->stacks.push_back(Stack(this)); this->stacks.back().Start(); } - + this->is_running = true; }