Commit 1ac16dae authored by nanahira's avatar nanahira

Merge branch 'server' into full-view

parents abb0ebbf c40524d9
...@@ -33,8 +33,8 @@ HostInfo game_info; ...@@ -33,8 +33,8 @@ HostInfo game_info;
void Game::MainServerLoop() { void Game::MainServerLoop() {
initUtils(); initUtils();
deckManager.LoadLFList(); deckManager.LoadLFList();
LoadExpansions();
dataManager.LoadDB(L"cards.cdb"); dataManager.LoadDB(L"cards.cdb");
LoadExpansions();
aServerPort = NetServer::StartServer(aServerPort); aServerPort = NetServer::StartServer(aServerPort);
NetServer::InitDuel(); NetServer::InitDuel();
......
...@@ -39,6 +39,10 @@ solution "ygo" ...@@ -39,6 +39,10 @@ solution "ygo"
end end
end end
if os.ishost("windows") then
BUILD_LUA=true
end
configurations { "Release", "Debug" } configurations { "Release", "Debug" }
if os.getenv("YGOPRO_NO_LUA_SAFE") then if os.getenv("YGOPRO_NO_LUA_SAFE") then
defines { "LUA_COMPAT_5_2", "YGOPRO_SERVER_MODE" } defines { "LUA_COMPAT_5_2", "YGOPRO_SERVER_MODE" }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment