edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replaced sql build config with nosql, to make sql added by default.

Browse source 
server build configs are currently server_release/server_debug or server_nosql_release/server_nosql_debug
this is also reported to work fine on macosx without any user changes
This commit is contained in:
GreYFoXGTi 2010-12-01 21:10:45 +02:00
parent 4c4544da12
commit ed3b009a31
2 changed files with 33 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
README_MAC_OSX_USER
View file

@ -1,43 +0,0 @@
Dear Mac OSX User...
to get this mod compiled with MySQL on a Mac running OSX 10.5 or newer you need to download and unzip three little things first.
1. Download:
* the appropiate Version (e.g. 32 vs. 64 bit) of the MySQL Community Server at
http://www.mysql.com/downloads/mysql/
* the appropiate Version (e.g. 32 vs. 64 bit) of the MySQL Connector/C++ at
http://www.mysql.com/downloads/connector/cpp/
* boost at (the connector needs it)
http://www.boost.org/
2. Unzip:
* the MySQL Community Server files and move them to
/usr/local/mysql/
* Unzip the MySQL Connector/C++ files and move them to
/usr/local/mysql/
* Unzip the boost files and move the boost folder >inside of< boost to (it will be a collection of header files) to
/usr/local/mysql/includes
Of course you could extract only the needed lib and header files and put them somewhere else (e.g. in your teeworlds folder) but above solution is intended to be easy and quick to apply.
Thanks for reading
Allisone
DDRace README is as follows
This is a mod (DDRace) and it's for the game Teeworlds and it's being maintained by GreYFoX@GTi & btd with the help of others like heinrich5991 & 3da, in the previous versions Floff, noother and Fluxid.
DDRace has been rebuilt from scratch by btd based on DDRace-Beta to Teeworlds Trunk 0.5, GreYFoX@GTi helped re-adding features once it was Trunk, you can track this in the commit log.
Teeworlds README is as follows:
Copyright (c) 2010 Magnus Auvinen
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Please visit http://www.teeworlds.com for up-to-date information about
the game, including new versions, custom maps and much more

66
bam.lua
View file

@ -188,7 +188,7 @@ function build(settings)
launcher_settings = engine_settings:Copy()
if family == "unix" then
if string.find(settings.config_name, "sql") then
if not string.find(settings.config_name, "nosql") then
server_settings.link.libs:Add("mysqlcppconn-static")
server_settings.link.libs:Add("mysqlclient")
end
@ -199,14 +199,14 @@ function build(settings)
client_settings.link.frameworks:Add("Carbon")
client_settings.link.frameworks:Add("Cocoa")
launcher_settings.link.frameworks:Add("Cocoa")
if string.find(settings.config_name, "sql") then
if not string.find(settings.config_name, "nosql") then
server_settings.link.libpath:Add("other/mysql/mac/lib32")
end
else
client_settings.link.libs:Add("X11")
client_settings.link.libs:Add("GL")
client_settings.link.libs:Add("GLU")
if string.find(settings.config_name, "sql") then
if not string.find(settings.config_name, "nosql") then
if arch == "amd64" then
server_settings.link.libpath:Add("other/mysql/linux/lib64")
else
@ -219,7 +219,7 @@ function build(settings)
client_settings.link.libs:Add("opengl32")
client_settings.link.libs:Add("glu32")
client_settings.link.libs:Add("winmm")
if string.find(settings.config_name, "sql") then
if not string.find(settings.config_name, "nosql") then
server_settings.link.libpath:Add("other/mysql/vc2005libs")
server_settings.link.libs:Add("mysqlcppconn")
end
@ -278,10 +278,10 @@ function build(settings)
-- make targets
c = PseudoTarget("client".."_"..settings.config_name, client_exe, client_depends)
if string.find(settings.config_name, "sql") then
s = PseudoTarget("server".."_"..settings.config_name, server_exe, serverlaunch, server_sql_depends)
else
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)
end
g = PseudoTarget("game".."_"..settings.config_name, client_exe, server_exe)
@ -299,28 +299,28 @@ debug_settings.config_name = "debug"
debug_settings.config_ext = "_d"
debug_settings.debug = 1
debug_settings.optimize = 0
debug_settings.cc.defines:Add("CONF_DEBUG")
debug_settings.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
debug_sql_settings = NewSettings()
debug_sql_settings.config_name = "sql_debug"
debug_sql_settings.config_ext = "_sql_d"
debug_sql_settings.config_name = "nosql_debug"
debug_sql_settings.config_ext = "_nosql_d"
debug_sql_settings.debug = 1
debug_sql_settings.optimize = 0
debug_sql_settings.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
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")
release_settings.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
release_sql_settings = NewSettings()
release_sql_settings.config_name = "sql_release"
release_sql_settings.config_ext = "_sql"
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", "CONF_SQL")
release_sql_settings.cc.defines:Add("CONF_RELEASE")
if platform == "macosx" and arch == "ia32" then
debug_settings_ppc = debug_settings:Copy()
@ -328,48 +328,48 @@ if platform == "macosx" and arch == "ia32" then
debug_settings_ppc.config_ext = "_ppc_d"
debug_settings_ppc.cc.flags:Add("-arch ppc")
debug_settings_ppc.link.flags:Add("-arch ppc")
debug_settings_ppc.cc.defines:Add("CONF_DEBUG")
debug_settings_ppc.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
debug_sql_settings_ppc = debug_sql_settings:Copy()
debug_sql_settings_ppc.config_name = "sql_debug_ppc"
debug_sql_settings_ppc.config_ext = "_sql_ppc_d"
debug_sql_settings_ppc.config_name = "nosql_debug_ppc"
debug_sql_settings_ppc.config_ext = "_nosql_ppc_d"
debug_sql_settings_ppc.cc.flags:Add("-arch ppc")
debug_sql_settings_ppc.link.flags:Add("-arch ppc")
debug_sql_settings_ppc.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
debug_sql_settings_ppc.cc.defines:Add("CONF_DEBUG")
release_settings_ppc = release_settings:Copy()
release_settings_ppc.config_name = "release_ppc"
release_settings_ppc.config_ext = "_ppc"
release_settings_ppc.cc.flags:Add("-arch ppc")
release_settings_ppc.link.flags:Add("-arch ppc")
release_settings_ppc.cc.defines:Add("CONF_RELEASE")
release_settings_ppc.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
release_sql_settings_ppc = release_sql_settings:Copy()
release_sql_settings_ppc.config_name = "sql_release_ppc"
release_sql_settings_ppc.config_ext = "_sql_ppc"
release_sql_settings_ppc.config_name = "nosql_release_ppc"
release_sql_settings_ppc.config_ext = "_nosql_ppc"
release_sql_settings_ppc.cc.flags:Add("-arch ppc")
release_sql_settings_ppc.link.flags:Add("-arch ppc")
release_sql_settings_ppc.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
release_sql_settings_ppc.cc.defines:Add("CONF_RELEASE")
debug_settings_x86 = debug_settings:Copy()
debug_settings_x86.config_name = "debug_x86"
debug_settings_x86.config_ext = "_x86_d"
debug_settings_x86.cc.defines:Add("CONF_DEBUG")
debug_settings_x86.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
debug_sql_settings_x86 = debug_sql_settings:Copy()
debug_sql_settings_x86.config_name = "sql_debug_x86"
debug_sql_settings_x86.config_ext = "_sql_x86_d"
debug_sql_settings_x86.cc.defines:Add("CONF_DEBUG", "CONF_SQL")
debug_sql_settings_x86.config_name = "nosql_debug_x86"
debug_sql_settings_x86.config_ext = "_nosql_x86_d"
debug_sql_settings_x86.cc.defines:Add("CONF_DEBUG")
release_settings_x86 = release_settings:Copy()
release_settings_x86.config_name = "release_x86"
release_settings_x86.config_ext = "_x86"
release_settings_x86.cc.defines:Add("CONF_RELEASE")
release_settings_x86.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
release_sql_settings_x86 = release_sql_settings:Copy()
release_sql_settings_x86.config_name = "sql_release_x86"
release_sql_settings_x86.config_ext = "_sql_x86"
release_sql_settings_x86.cc.defines:Add("CONF_RELEASE", "CONF_SQL")
release_sql_settings_x86.config_name = "nosql_release_x86"
release_sql_settings_x86.config_ext = "_nosql_x86"
release_sql_settings_x86.cc.defines:Add("CONF_RELEASE")
ppc_d = build(debug_settings_ppc)
x86_d = build(debug_settings_x86)
@ -386,9 +386,9 @@ if platform == "macosx" and arch == "ia32" then
PseudoTarget("sql_debug", sql_ppc_d, sql_x86_d)
PseudoTarget("server_release", "server_release_x86", "server_release_ppc")
PseudoTarget("server_sql_release", "server_sql_release_x86", "server_sql_release_ppc")
PseudoTarget("server_nosql_release", "server_nosql_release_x86", "server_nosql_release_ppc")
PseudoTarget("server_debug", "server_debug_x86", "server_debug_ppc")
PseudoTarget("server_sql_debug", "server_sql_debug_x86", "server_sql_debug_ppc")
PseudoTarget("server_nosql_debug", "server_nosql_debug_x86", "server_nosql_debug_ppc")
PseudoTarget("client_release", "client_release_x86", "client_release_ppc")
PseudoTarget("client_debug", "client_debug_x86", "client_debug_ppc")
else