1 files changed, 39 insertions, 25 deletions

diff --git a/default.bam b/default.bam
index 2f375ac3..839c2cba 100644
--- a/default.bam
+++ b/default.bam
@@ -91,43 +91,57 @@ function DataCompile(datafile, scriptfile, headerfile, sourcefile, outputdatafil
 	return {data = outputdatafile, header=headerfile, source=sourcefile}
 end
 
---baselib = Import("src/baselib/baselib.bam")
-baselib = Import("../baselib/baselib.bam")
+config_name = "debug"
+config_ext = ""
+
 settings = NewSettings()
+settings.cc.output = function(input, extention)
+	return Path("objs/" .. PathFilename(input) .. config_ext .. extention)
+end
+
+baselib_options = {}
+baselib_options.settings = settings
+baselib = Import("../baselib/baselib.bam", baselib_options)
 baselib.apply(settings, "all")
 
 server_settings = NewSettings()
 baselib.apply(server_settings, "network")
 
-settings.cc.debug = 1
-settings.cc.optimize = 0
 if family == "windows" then
 	settings.cc.flags = "/wd4244"
 else
 	settings.cc.flags = "-Wall"
 end
+
 settings.cc.includes:add("src")
 settings.cc.includes:add("../baselib/src/external/zlib")
 
-serverdata = DataCompile("datasrc/teewars.ds", "datasrc/server.dts", "src/game/server/data.h", "src/game/server/data/data.cpp", "data/server.dat")
-clientdata = DataCompile("datasrc/teewars.ds", "datasrc/client.dts", "src/game/client/data.h", "src/game/client/data/data.cpp", "data/client.dat")
-
-engine = Compile(settings, Collect("src/engine/*.cpp"))
-client = Compile(settings, Collect("src/engine/client/*.cpp", "src/engine/client/pnglite/*.c"))
-server = Compile(settings, Collect("src/engine/server/*.cpp"))
-game_shared = Compile(settings, Collect("src/game/*.cpp"))
-game_client = Compile(settings, Collect("src/game/client/*.cpp"), clientdata.source)
-game_server = Compile(settings, Collect("src/game/server/*.cpp"), serverdata.source)
-editor = Compile(settings, Collect("src/editor/*.cpp"))
-
-crapnet = Compile(settings, Collect("src/crapnet/*.cpp"))
-
-client_exe = Link(settings, "teewars", engine, client, editor, game_shared, game_client)
-server_exe = Link(server_settings, "teewars_srv", engine, server, game_shared, game_server)
--- editor_exe = Link(settings, "editor", engine, game_shared, editor)
-crapnet_exe = Link(server_settings, "crapnet", crapnet)
+serverdata = DataCompile("datasrc/teewars.ds", "datasrc/server.dts", "src/game/server/data.h", "src/game/server/data/server_data.cpp", "data/server.dat")
+clientdata = DataCompile("datasrc/teewars.ds", "datasrc/client.dts", "src/game/client/data.h", "src/game/client/data/client_data.cpp", "data/client.dat")
+
+function build(config)
+	engine = Compile(settings, Collect("src/engine/*.cpp"))
+	client = Compile(settings, Collect("src/engine/client/*.cpp", "src/engine/client/pnglite/*.c"))
+	server = Compile(settings, Collect("src/engine/server/*.cpp"))
+	masterserver = Compile(settings, Collect("src/mastersrv/*.cpp"))
+	game_shared = Compile(settings, Collect("src/game/*.cpp"))
+	game_client = Compile(settings, Collect("src/game/client/*.cpp"), clientdata.source)
+	game_server = Compile(settings, Collect("src/game/server/*.cpp"), serverdata.source)
+	editor = Compile(settings, Collect("src/editor/*.cpp"))
+
+	crapnet = Compile(settings, Collect("src/crapnet/*.cpp"))
+
+	client_exe = Link(settings, "teewars"..config_ext, engine, client, editor, game_shared, game_client)
+	server_exe = Link(server_settings, "teewars_srv"..config_ext, engine, server, game_shared, game_server)
+	masterserver_exe = Link(server_settings, "mastersrv"..config_ext, masterserver, engine)
+	-- editor_exe = Link(settings, "editor", engine, game_shared, editor)
+	crapnet_exe = Link(server_settings, "crapnet"..config_ext, crapnet)
+
+	Target(PseudoTarget("client", client_exe, clientdata.data))
+	Target(PseudoTarget("server", server_exe, serverdata.data))
+	Target(PseudoTarget("masterserver", masterserver_exe))
+	Target(PseudoTarget("tools", crapnet_exe))
+	-- Target(PseudoTarget("editor", editor_exe))
+end
 
-Target(PseudoTarget("client", client_exe, clientdata.data))
-Target(PseudoTarget("server", server_exe, serverdata.data))
-Target(PseudoTarget("tools", crapnet_exe))
--- Target(PseudoTarget("editor", editor_exe))
+build("debug")