Added lua and SQL, but removed lsqlite3.c
lsqlite3.c looked like a good idea for connnecting SQL and lua, but I couldn't get it to work and rather than struggle on this, I'll write my own library later on.
This commit is contained in:
+2
-2
@@ -28,10 +28,10 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
int main(int, char**) {
|
||||
int main(int argc, char** argv) {
|
||||
cout << "Beginning server" << endl;
|
||||
try {
|
||||
ServerApplication::GetInstance()->Init();
|
||||
ServerApplication::GetInstance()->Init(argc, argv);
|
||||
ServerApplication::GetInstance()->Loop();
|
||||
ServerApplication::GetInstance()->Quit();
|
||||
}
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ COMMONDIR+=../common
|
||||
COMMON+=../libcommon.a
|
||||
LIB+=$(COMMON) -lmingw32 -lSDLmain -lSDL -llua -lsqlite3
|
||||
CXXFLAGS+=-std=c++11 -DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
CFLAGS+=-DDEBUG -I$(COMMONDIR)
|
||||
CFLAGS+=-DDEBUG $(addprefix -I,$(COMMONDIR))
|
||||
|
||||
#source
|
||||
CXXSRC=$(wildcard *.cpp)
|
||||
|
||||
@@ -21,6 +21,11 @@
|
||||
*/
|
||||
#include "server_application.hpp"
|
||||
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
ServerApplication ServerApplication::instance;
|
||||
|
||||
ServerApplication::ServerApplication() {
|
||||
@@ -31,12 +36,41 @@ ServerApplication::~ServerApplication() {
|
||||
//TODO
|
||||
}
|
||||
|
||||
void ServerApplication::Init() {
|
||||
//TODO
|
||||
void ServerApplication::Init(int argc, char** argv) {
|
||||
//Check thread safety
|
||||
if (!sqlite3_threadsafe()) {
|
||||
throw(std::runtime_error("Cannot run without thread safety"));
|
||||
}
|
||||
else {
|
||||
std::cout << "Thread safety confirmed" << std::endl;
|
||||
}
|
||||
|
||||
//Init SDL
|
||||
if (SDL_Init(0)) {
|
||||
throw(std::runtime_error("Failed to initialize SDL"));
|
||||
}
|
||||
else {
|
||||
std::cout << "SDL initialized" << std::endl;
|
||||
}
|
||||
|
||||
//Init lua
|
||||
if (!(luaState = luaL_newstate())) {
|
||||
throw(std::runtime_error("Failed to create the lua state"));
|
||||
}
|
||||
else {
|
||||
std::cout << "lua initialized" << std::endl;
|
||||
}
|
||||
luaL_openlibs(luaState);
|
||||
|
||||
//Init SQL
|
||||
std::string dbname = (argc > 1) ? argv[1] : argv[0];
|
||||
int ret = sqlite3_open_v2((dbname + ".db").c_str(), &database, SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_FULLMUTEX, nullptr);
|
||||
if (ret != SQLITE_OK || !database) {
|
||||
throw(std::runtime_error("Failed to open the server database"));
|
||||
}
|
||||
else {
|
||||
std::cout << "Database filename: \"" << dbname << ".db\"" << std::endl;
|
||||
}
|
||||
}
|
||||
|
||||
void ServerApplication::Loop() {
|
||||
@@ -44,5 +78,7 @@ void ServerApplication::Loop() {
|
||||
}
|
||||
|
||||
void ServerApplication::Quit() {
|
||||
//TODO
|
||||
sqlite3_close(database);
|
||||
lua_close(luaState);
|
||||
SDL_Quit();
|
||||
}
|
||||
|
||||
@@ -22,6 +22,10 @@
|
||||
#ifndef SERVERAPPLICATION_HPP_
|
||||
#define SERVERAPPLICATION_HPP_
|
||||
|
||||
#include "lua/lua.hpp"
|
||||
#include "sqlite3/sqlite3.h"
|
||||
#include "SDL/SDL.h"
|
||||
|
||||
//The main application class
|
||||
class ServerApplication {
|
||||
private:
|
||||
@@ -32,12 +36,15 @@ private:
|
||||
public:
|
||||
static ServerApplication* GetInstance() { return &instance; }
|
||||
|
||||
void Init();
|
||||
void Init(int argc, char** argv);
|
||||
void Loop();
|
||||
void Quit();
|
||||
|
||||
private:
|
||||
bool running = true;
|
||||
|
||||
lua_State* luaState = nullptr;
|
||||
sqlite3* database = nullptr;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user