Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-05-02 18:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '14-fix-lua-library-naming-for-proper-compilation-without-errors' into 'master'

Browse Source 
Resolve "Fix lua library naming for proper compilation without errors"

Closes #14

See merge request ErikasKontenis/Sabrehaven!2
This commit is contained in:
Erikas Kontenis 2019-09-15 10:16:47 +00:00
commit 89df66e1c9
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -14,3 +14,6 @@ vc14/theforgottenserver.vcxproj.user
vc14/.vs/ vc14/.vs/
*.pdb *.pdb
*.dll *.dll
/.vs
/vc14/Debug
/vc14/UpgradeLog.htm

2
config.lua
View File

@ -59,7 +59,7 @@ mapAuthor = "CipSoft"
mysqlHost = "127.0.0.1" mysqlHost = "127.0.0.1"
mysqlUser = "root" mysqlUser = "root"
mysqlPass = "" mysqlPass = ""
mysqlDatabase = "nostalrius" mysqlDatabase = "sabrehaven"
mysqlPort = 3306 mysqlPort = 3306
mysqlSock = "" mysqlSock = ""

2
src/configmanager.h
View File

@ -20,7 +20,7 @@
#ifndef FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39 #ifndef FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39
#define FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39 #define FS_CONFIGMANAGER_H_6BDD23BD0B8344F4B7C40E8BE6AF6F39
#include <lua.hpp> #include <luajit/lua.hpp>
class ConfigManager class ConfigManager
{ {

2
src/luascript.h
View File

@ -20,7 +20,7 @@
#ifndef FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8 #ifndef FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8
#define FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8 #define FS_LUASCRIPT_H_5344B2BC907E46E3943EA78574A212D8
#include <lua.hpp> #include <luajit/lua.hpp>
#if LUA_VERSION_NUM >= 502 #if LUA_VERSION_NUM >= 502
#ifndef LUA_COMPAT_ALL #ifndef LUA_COMPAT_ALL