edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

server_release on windows has no sql by default because my sql on the server_release version of windows doesn't work, but it does on server_debug

Browse source
This commit is contained in:
GreYFoXGTi 2010-12-04 16:20:28 +02:00
parent 987881c02a
commit a838ad9da6
2 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
bam.lua
View file

@ -281,7 +281,15 @@ function build(settings)
if string.find(settings.config_name, "nosql") then
s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch)
else
s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch, server_sql_depends)
if family == "windows" then
if string.find(settings.config_name, "sql") or not string.find(settings.config_name, "release") then
s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch, server_sql_depends)
else
s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch)
end
else
s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch, server_sql_depends)
end
end
g = PseudoTarget("game".."_"..settings.config_name, client_exe, server_exe)
@ -296,7 +304,7 @@ end
debug_settings = NewSettings()
debug_settings.config_name = "debug"
debug_settings.config_ext = "_d"
debug_settings.config_ext = "_sql_d"
debug_settings.debug = 1
debug_settings.optimize = 0
debug_settings.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
@ -310,17 +318,31 @@ debug_sql_settings.cc.defines:Add("CONF_DEBUG")
release_settings = NewSettings()
release_settings.config_name = "release"
release_settings.config_ext = ""
release_settings.debug = 0
release_settings.optimize = 1
release_settings.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
if family == "windows" then
release_settings.cc.defines:Add("CONF_RELEASE")
release_settings.config_ext = "_nosql"
release_sql_settings = NewSettings()
release_sql_settings.config_name = "sql_release"
release_sql_settings.config_ext = ""
release_sql_settings.debug = 0
release_sql_settings.optimize = 1
release_sql_settings.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
else
release_sql_settings = NewSettings()
release_sql_settings.config_name = "nosql_release"
release_sql_settings.config_ext = "_nosql"
release_sql_settings.debug = 0
release_sql_settings.optimize = 1
release_sql_settings.cc.defines:Add("CONF_RELEASE")
release_settings.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
release_settings.config_ext = ""
release_sql_settings = NewSettings()
release_sql_settings.config_name = "nosql_release"
release_sql_settings.config_ext = "_nosql"
release_sql_settings.debug = 0
release_sql_settings.optimize = 1
release_sql_settings.cc.defines:Add("CONF_RELEASE")
end
if platform == "macosx" and arch == "ia32" then
debug_settings_ppc = debug_settings:Copy()

4
src/game/server/score/sql_score.cpp
View file

@ -59,7 +59,7 @@ bool CSqlScore::Connect()
}
catch (sql::SQLException &e)
{
char aBuf[256];
char aBuf[256];
str_format(aBuf, sizeof(aBuf), "MySQL Error: %s", e.what());
dbg_msg("SQL", aBuf);
@ -96,7 +96,7 @@ bool CSqlScore::Connect()
{
char aBuf[256];
//str_format(aBuf, sizeof(aBuf), "MySQL Error: %s", e.what());
dbg_msg("SQL", "Error");
dbg_msg("SQL", "Unknown Error cause by the MySQL/C++ Connector, my advice compile server_debug and use it");
dbg_msg("SQL", "ERROR: SQL connection failed");
return false;