Attachment #281847 for bug #363395




config:Add(OptCCompiler("compiler"))
config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
config:Add(OptLibrary("zlib", "zlib.h", false))
config:Add(OptLibrary("pnglite", "pnglite.h", false))
config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
config:Add(SDL.OptFind("sdl", true))
config:Add(FreeType.OptFind("freetype", true))

		settings.cc.includes:Add("src/engine/external/zlib")
	end

	-- build game components
	engine_settings = settings:Copy()
	server_settings = engine_settings:Copy()
	client_settings = engine_settings:Copy()
	launcher_settings = engine_settings:Copy()

	if config.pnglite.value == true then
		client_settings.link.libs:Add("pnglite")
		if config.pnglite.include_path then
			client_settings.cc.includes:Add(config.pnglite.include_path)
		end
		pnglite = {}
	else
		pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
		client_settings.cc.includes:Add("src/engine/external/pnglite")
	end

	if config.wavpack.value == true then
		client_settings.link.libs:Add("wavpack")
		if config.wavpack.include_path then
			client_settings.cc.includes:Add(config.wavpack.include_path)
		end
		wavpack = {}
	else
		wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
		client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
	end

	-- build the small libraries
	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))

	-- build game components
	engine_settings = settings:Copy()
	server_settings = engine_settings:Copy()
	client_settings = engine_settings:Copy()
	launcher_settings = engine_settings:Copy()

	if family == "unix" then
		if platform == "macosx" then
			client_settings.link.frameworks:Add("OpenGL")

Lines 20-26 Link Here

(-)a/src/engine/client/graphics.cpp (-1 / +1 lines)
20	#endif	20	#endif
21		21
22	#include <base/system.h>	22	#include <base/system.h>
23	#include <engine/external/pnglite/pnglite.h>	23	#include <pnglite.h>
24		24
25	#include <engine/shared/config.h>	25	#include <engine/shared/config.h>
26	#include <engine/graphics.h>	26	#include <engine/graphics.h>

Lines 2-8 Link Here

(-)a/src/tools/dilate.cpp (-1 / +1 lines)
2	/* If you are missing that file, acquire a complete release at teeworlds.com. */	2	/* If you are missing that file, acquire a complete release at teeworlds.com. */
3	#include <base/system.h>	3	#include <base/system.h>
4	#include <base/math.h>	4	#include <base/math.h>
5	#include <engine/external/pnglite/pnglite.h>	5	#include <pnglite.h>
6		6
7	typedef struct	7	typedef struct
8	{	8	{

Lines 1-7 Link Here

(-)a/src/tools/tileset_borderfix.cpp (-1 / +1 lines)
1	/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */	1	/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
2	/* If you are missing that file, acquire a complete release at teeworlds.com. */	2	/* If you are missing that file, acquire a complete release at teeworlds.com. */
3	#include <base/system.h>	3	#include <base/system.h>
4	#include <engine/external/pnglite/pnglite.h>	4	#include <pnglite.h>
5		5
6	typedef struct	6	typedef struct
7	{	7	{

Return to bug 363395

Lines 9-14 config = NewConfig() Link Here

(-)a/bam.lua (-12 / +21 lines)
9	config:Add(OptCCompiler("compiler"))	9	config:Add(OptCCompiler("compiler"))
10	config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))	10	config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}", "-fstack-protector -fstack-protector-all"))
11	config:Add(OptLibrary("zlib", "zlib.h", false))	11	config:Add(OptLibrary("zlib", "zlib.h", false))
		12	config:Add(OptLibrary("pnglite", "pnglite.h", false))
12	config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))	13	config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false))
13	config:Add(SDL.OptFind("sdl", true))	14	config:Add(SDL.OptFind("sdl", true))
14	config:Add(FreeType.OptFind("freetype", true))	15	config:Add(FreeType.OptFind("freetype", true))
Lines 177-202 function build(settings) Link Here
177	settings.cc.includes:Add("src/engine/external/zlib")	178	settings.cc.includes:Add("src/engine/external/zlib")
178	end	179	end
179		180
		181	-- build game components
		182	engine_settings = settings:Copy()
		183	server_settings = engine_settings:Copy()
		184	client_settings = engine_settings:Copy()
		185	launcher_settings = engine_settings:Copy()
		186
		187	if config.pnglite.value == true then
		188	client_settings.link.libs:Add("pnglite")
		189	if config.pnglite.include_path then
		190	client_settings.cc.includes:Add(config.pnglite.include_path)
		191	end
		192	pnglite = {}
		193	else
		194	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
		195	client_settings.cc.includes:Add("src/engine/external/pnglite")
		196	end
		197
180	if config.wavpack.value == true then	198	if config.wavpack.value == true then
181	settings.link.libs:Add("wavpack")	199	client_settings.link.libs:Add("wavpack")
182	if config.wavpack.include_path then	200	if config.wavpack.include_path then
183	settings.cc.includes:Add(config.wavpack.include_path)	201	client_settings.cc.includes:Add(config.wavpack.include_path)
184	end	202	end
185	wavpack = {}	203	wavpack = {}
186	else	204	else
187	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))	205	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
188	settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder	206	client_settings.cc.includes:Add("src/engine/external/") --The header is wavpack/wavpack.h so include the external folder
189	end	207	end
190		208
191	-- build the small libraries
192	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
193
194	-- build game components
195	engine_settings = settings:Copy()
196	server_settings = engine_settings:Copy()
197	client_settings = engine_settings:Copy()
198	launcher_settings = engine_settings:Copy()
199
200	if family == "unix" then	209	if family == "unix" then
201	if platform == "macosx" then	210	if platform == "macosx" then
202	client_settings.link.frameworks:Add("OpenGL")	211	client_settings.link.frameworks:Add("OpenGL")