Migrate to premake5, fixes #3729.

Make pyrogenesis and tests depend on Collada, fixes #404.

This commit includes custom modules for CxxTest and pkg-config support
that can be improved upon in the future. It also includes all necessary
changes to the build scripts, but the new premake5 features are not
fully exploited yet.

With this change, premake5 becomes the default, but CI scripts on Unix
will continue using premake4 for a while, in order to avoid regressions.

Includes code by zsol.
Reviewed by: wraitii, leper
Differential Revision: https://code.wildfiregames.com/D72
This was SVN commit r20381.

build/jenkins/build-patch.sh

@@ -65,7 +65,7 @@ build()
 {
   {
     echo 'Updating workspaces...'
-    build/workspaces/update-workspaces.sh "${JOBS}" --with-system-nvtt --without-miniupnpc 2>&1 1>/dev/null
+    build/workspaces/update-workspaces.sh "${JOBS}" --premake4 --with-system-nvtt --without-miniupnpc 2>&1 1>/dev/null
     cd build/workspaces/gcc
     echo 'Build (release)...'
     make "${JOBS}" config=release 2>&1 1>/dev/null

build/premake/cxxtest/README.md

@@ -0,0 +1 @@
+This premake module adds supports for CxxTest (http://cxxtest.com/).

build/premake/cxxtest/cxxtest.lua

@@ -0,0 +1,57 @@
+local m = {}
+m._VERSION = "1.0.0-dev"
+
+m.path = nil
+
+-- We need to create .cpp files from the .h files before they can be compiled.
+-- This is done by the cxxtestgen utility.
+
+-- We use a custom build rule for headers in order to generate the .cpp files.
+-- This has several advantages over using pre-build commands:
+-- - It cannot break when running parallel builds
+-- - No new generation happens when the header files are untouched
+
+function m.configure_project(rootfile, hdrfiles, rootoptions, testoptions)
+	if rootoptions == nil then
+		rootoptions = ''
+	end
+	if testoptions == nil then
+		testoptions = ''
+	end
+
+	local abspath = path.getabsolute(m.path)
+	local rootpath = path.getabsolute(rootfile)
+
+	-- Add headers
+
+	for _,hdrfile in ipairs(hdrfiles) do
+		files { hdrfile }
+	end
+
+	-- Generate the source files from headers
+
+	-- This first one is a hack, precompiled has nothing to do with the test runner,
+	-- but we need to make the file compilation depend on its generation (which
+	-- buildoutputs does).
+	-- Ideally premake should have an API to specify pre-build commands per file.
+	filter { "files:**precompiled.h" }
+		buildmessage 'Generating root file'
+		buildcommands { abspath.." --root "..rootoptions.." -o "..rootpath }
+		buildoutputs { rootpath }
+	filter { "files:**.h", "files:not **precompiled.h" }
+		buildmessage 'Generating %{file.basename}.cpp'
+		buildcommands { abspath.." --part "..testoptions.." -o %{file.directory}/%{file.basename}.cpp %{file.relpath}" }
+		buildoutputs { "%{file.directory}/%{file.basename}.cpp" }
+	filter {}
+
+	-- Add source files
+
+	files { rootfile }
+
+	for _,hdrfile in ipairs(hdrfiles) do
+		local srcfile = string.sub(hdrfile, 1, -3) .. ".cpp"
+		files { srcfile }
+	end
+end
+
+return m

build/premake/extern_libs5.lua

@@ -0,0 +1,713 @@
+-- this file provides project_add_extern_libs, which takes care of the
+-- dirty details of adding the libraries' include and lib paths.
+--
+-- TYPICAL TASK: add new library. Instructions:
+-- 1) add a new extern_lib_defs entry
+-- 2) add library name to extern_libs tables in premake.lua for all 'projects' that want to use it
+
+-- directory in which OS-specific library subdirectories reside.
+if os.istarget("macosx") then
+	libraries_dir = rootdir.."/libraries/osx/"
+elseif os.istarget("windows") then
+	libraries_dir = rootdir.."/libraries/win32/"
+else
+	-- No Unix-specific libs yet (use source directory instead!)
+end
+-- directory for shared, bundled libraries
+libraries_source_dir = rootdir.."/libraries/source/"
+third_party_source_dir = rootdir.."/source/third_party/"
+
+local function add_default_lib_paths(extern_lib)
+	libdirs { libraries_dir .. extern_lib .. "/lib" }
+end
+
+local function add_source_lib_paths(extern_lib)
+	libdirs { libraries_source_dir .. extern_lib .. "/lib" }
+end
+
+local function add_default_include_paths(extern_lib)
+	sysincludedirs { libraries_dir .. extern_lib .. "/include" }
+end
+
+local function add_source_include_paths(extern_lib)
+	sysincludedirs { libraries_source_dir .. extern_lib .. "/include" }
+end
+
+local function add_third_party_include_paths(extern_lib)
+	sysincludedirs { third_party_source_dir .. extern_lib .. "/include" }
+end
+
+pkgconfig = require "pkgconfig"
+
+
+local function add_delayload(name, suffix, def)
+
+	if def["no_delayload"] then
+		return
+	end
+
+	-- currently only supported by VC; nothing to do on other platforms.
+	if not os.istarget("windows") then
+		return
+	end
+
+	-- no extra debug version; use same library in all configs
+	if suffix == "" then
+		linkoptions { "/DELAYLOAD:"..name..".dll" }
+	-- extra debug version available; use in debug config
+	else
+		local dbg_cmd = "/DELAYLOAD:" .. name .. suffix .. ".dll"
+		local cmd     = "/DELAYLOAD:" .. name .. ".dll"
+
+		filter "Debug"
+			linkoptions { dbg_cmd }
+		filter "Release"
+			linkoptions { cmd }
+		filter { }
+	end
+
+end
+
+local function add_default_links(def)
+
+	-- careful: make sure to only use *_names when on the correct platform.
+	local names = {}
+	if os.istarget("windows") then
+		if def.win_names then
+			names = def.win_names
+		end
+	elseif _OPTIONS["android"] and def.android_names then
+		names = def.android_names
+	elseif os.istarget("linux") and def.linux_names then
+		names = def.linux_names
+	elseif os.istarget("macosx") and def.osx_names then
+		names = def.osx_names
+	elseif os.istarget("bsd") and def.bsd_names then
+		names = def.bsd_names
+	elseif def.unix_names then
+		names = def.unix_names
+	end
+
+	local suffix = "d"
+	-- library is overriding default suffix (typically "" to indicate there is none)
+	if def["dbg_suffix"] then
+		suffix = def["dbg_suffix"]
+	end
+	-- non-Windows doesn't have the distinction of debug vs. release libraries
+	-- (to be more specific, they do, but the two are binary compatible;
+	-- usually only one type - debug or release - is installed at a time).
+	if not os.istarget("windows") then
+		suffix = ""
+	end
+
+	-- OS X "Frameworks" are added to the links as "name.framework"
+	if os.istarget("macosx") and def.osx_frameworks then
+		for i,name in pairs(def.osx_frameworks) do
+			links { name .. ".framework" }
+		end
+	else
+		for i,name in pairs(names) do
+			filter "Debug"
+				links { name .. suffix }
+			filter "Release"
+				links { name }
+			filter { }
+
+			add_delayload(name, suffix, def)
+		end
+	end
+end
+
+-- Library definitions
+-- In a perfect world, libraries would have a common installation template,
+-- i.e. location of include directory, naming convention for .lib, etc.
+-- this table provides a means of working around each library's differences.
+--
+-- The basic approach is defining two functions per library:
+--
+-- 1. compile_settings
+-- This function should set all settings requred during the compile-phase like
+-- includedirs, defines etc...
+--
+-- 2. link_settings
+-- This function should set all settings required during the link-phase like
+-- libdirs, linkflag etc...
+--
+-- The main reason for separating those settings is different linking behaviour
+-- on osx and xcode. For more details, read the comment in project_add_extern_libs.
+--
+-- There are some helper functions for the most common tasks. You should use them
+-- if they can be used in your situation to make the definitions more consistent and
+-- use their default beviours as a guideline.
+--
+--
+-- add_default_lib_paths(extern_lib)
+--      Description: Add '<libraries root>/<libraryname>/lib'to the libpaths
+--      Parameters:
+--          * extern_lib: <libraryname> to be used in the libpath.
+--
+-- add_default_include_paths(extern_lib)
+--      Description: Add '<libraries root>/<libraryname>/include' to the includepaths
+--      Parameters:
+--          * extern_lib: <libraryname> to be used in the libpath.
+--
+-- add_default_links
+--		Description: Adds links to libraries and configures delayloading.
+-- 		If the *_names parameter for a plattform is missing, no linking will be done
+-- 		on that plattform.
+--		The default assumptions are:
+--		* debug import library and DLL are distinguished with a "d" suffix
+-- 		* the library should be marked for delay-loading.
+--		Parameters:
+--      * win_names: table of import library / DLL names (no extension) when
+--   	  running on Windows.
+--      * unix_names: as above; shared object names when running on non-Windows.
+--      * osx_names: as above; for OS X specifically (overrides unix_names if both are
+--        specified)
+--      * bsd_names: as above; for BSD specifically (overrides unix_names if both are
+--        specified)
+--      * linux_names: ditto for Linux (overrides unix_names if both given)
+--      * dbg_suffix: changes the debug suffix from the above default.
+--        can be "" to indicate the library doesn't have a debug build;
+--        in that case, the same library (without suffix) is used in
+--        all build configurations.
+--      * no_delayload: indicate the library is not to be delay-loaded.
+--        this is necessary for some libraries that do not support it,
+--        e.g. Xerces (which is so stupid as to export variables).
+
+extern_lib_defs = {
+	boost = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("boost")
+			elseif os.istarget("macosx") then
+				-- Suppress all the Boost warnings on OS X by including it as a system directory
+				buildoptions { "-isystem../" .. libraries_dir .. "boost/include" }
+			end
+			-- TODO: This actually applies to most libraries we use on BSDs, make this a global setting.
+			if os.istarget("bsd") then
+				sysincludedirs { "/usr/local/include" }
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("boost")
+			end
+			add_default_links({
+				-- The following are not strictly link dependencies on all systems, but
+				-- are included for compatibility with different versions of Boost
+				android_names = { "boost_filesystem-gcc-mt", "boost_system-gcc-mt" },
+				unix_names = { os.findlib("boost_filesystem-mt") and "boost_filesystem-mt" or "boost_filesystem", os.findlib("boost_system-mt") and "boost_system-mt" or "boost_system" },
+				osx_names = { "boost_filesystem-mt", "boost_system-mt" },
+			})
+		end,
+	},
+	comsuppw = {
+		link_settings = function()
+			add_default_links({
+				win_names = { "comsuppw" },
+				dbg_suffix = "d",
+				no_delayload = 1,
+			})
+		end,
+	},
+	cxxtest = {
+		compile_settings = function()
+			sysincludedirs { libraries_source_dir .. "cxxtest-4.4" }
+		end,
+	},
+	enet = {
+		compile_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_include_paths("enet")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("enet")
+			end
+			add_default_links({
+				win_names  = { "enet" },
+				unix_names = { "enet" },
+			})
+		end,
+	},
+	fcollada = {
+		compile_settings = function()
+			add_source_include_paths("fcollada")
+		end,
+		link_settings = function()
+			add_source_lib_paths("fcollada")
+			if os.istarget("windows") then
+				filter "Debug"
+					links { "FColladaD" }
+				filter "Release"
+					links { "FCollada" }
+				filter { }
+			else
+				filter "Debug"
+					links { "FColladaSD" }
+				filter "Release"
+					links { "FColladaSR" }
+				filter { }
+			end
+		end,
+	},
+	gloox = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("gloox")
+			elseif os.istarget("macosx") then
+				-- Support GLOOX_CONFIG for overriding the default PATH-based gloox-config
+				gloox_config_path = os.getenv("GLOOX_CONFIG")
+				if not gloox_config_path then
+					gloox_config_path = "gloox-config"
+				end
+				pkgconfig.add_includes(nil, gloox_config_path.." --cflags")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("gloox")
+			end
+			if os.istarget("macosx") then
+				gloox_config_path = os.getenv("GLOOX_CONFIG")
+				if not gloox_config_path then
+					gloox_config_path = "gloox-config"
+				end
+				pkgconfig.add_links(nil, gloox_config_path.." --libs")
+			else
+				-- TODO: consider using pkg-config on non-Windows (for compile_settings too)
+				add_default_links({
+					win_names  = { "gloox-1.0" },
+					unix_names = { "gloox" },
+					no_delayload = 1,
+				})
+			end
+		end,
+	},
+	iconv = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("iconv")
+				defines { "HAVE_ICONV_CONST" }
+				defines { "ICONV_CONST=const" }
+				defines { "LIBICONV_STATIC" }
+			elseif os.istarget("macosx") then
+				add_default_include_paths("iconv")
+				defines { "LIBICONV_STATIC" }
+			elseif os.getversion().description == "FreeBSD" then
+				defines { "HAVE_ICONV_CONST" }
+				defines { "ICONV_CONST=const" }
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("iconv")
+			end
+			add_default_links({
+				win_names  = { "libiconv" },
+				osx_names = { "iconv" },
+				dbg_suffix = "",
+				no_delayload = 1,
+			})
+			-- glibc (used on Linux and GNU/kFreeBSD) has iconv
+			-- FreeBSD 10+ has iconv as a part of libc
+			if os.istarget("bsd")
+			   and not (os.getversion().description == "FreeBSD" and os.getversion().majorversion >= 10
+			            or os.getversion().description == "GNU/kFreeBSD") then
+				add_default_links({
+					bsd_names = { "iconv" },
+				})
+			end
+		end,
+	},
+	icu = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("icu")
+			elseif os.istarget("macosx") then
+				-- Support ICU_CONFIG for overriding the default PATH-based icu-config
+				icu_config_path = os.getenv("ICU_CONFIG")
+				if not icu_config_path then
+					icu_config_path = "icu-config"
+				end
+				pkgconfig.add_includes(nil, icu_config_path.." --cppflags")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("icu")
+			end
+			if os.istarget("macosx") then
+				icu_config_path = os.getenv("ICU_CONFIG")
+				if not icu_config_path then
+					icu_config_path = "gloox-config"
+				end
+				pkgconfig.add_links(nil, icu_config_path.." --ldflags-searchpath --ldflags-libsonly --ldflags-system")
+			else
+				add_default_links({
+					win_names  = { "icuuc", "icuin" },
+					unix_names = { "icui18n", "icuuc" },
+					dbg_suffix = "",
+					no_delayload = 1,
+				})
+			end
+		end,
+	},
+	libcurl = {
+		compile_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_include_paths("libcurl")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("libcurl")
+			end
+			add_default_links({
+				win_names  = { "libcurl" },
+				unix_names = { "curl" },
+			})
+		end,
+	},
+	libpng = {
+		compile_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_include_paths("libpng")
+			end
+			if os.getversion().description == "OpenBSD" then
+				sysincludedirs { "/usr/local/include/libpng" }
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("libpng")
+			end
+			add_default_links({
+				win_names  = { "libpng16" },
+				unix_names = { "png" },
+				-- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/
+				-- TODO: Figure out why that happens
+				osx_names = { "png16" },
+			})
+		end,
+	},
+	libxml2 = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("libxml2")
+			elseif os.istarget("macosx") then
+				-- Support XML2_CONFIG for overriding for the default PATH-based xml2-config
+				xml2_config_path = os.getenv("XML2_CONFIG")
+				if not xml2_config_path then
+					xml2_config_path = "xml2-config"
+				end
+
+				-- use xml2-config instead of pkg-config on OS X
+				pkgconfig.add_includes(nil, xml2_config_path.." --cflags")
+				-- libxml2 needs _REENTRANT or __MT__ for thread support;
+				-- OS X doesn't get either set by default, so do it manually
+				defines { "_REENTRANT" }
+			else
+				pkgconfig.add_includes("libxml-2.0")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("libxml2")
+				filter "Debug"
+					links { "libxml2" }
+				filter "Release"
+					links { "libxml2" }
+				filter { }
+			elseif os.istarget("macosx") then
+				xml2_config_path = os.getenv("XML2_CONFIG")
+				if not xml2_config_path then
+					xml2_config_path = "xml2-config"
+				end
+				pkgconfig.add_links(nil, xml2_config_path.." --libs")
+			else
+				pkgconfig.add_links("libxml-2.0")
+			end
+		end,
+	},
+	miniupnpc = {
+		compile_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_include_paths("miniupnpc")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("miniupnpc")
+			end
+			add_default_links({
+				win_names  = { "miniupnpc" },
+				unix_names = { "miniupnpc" },
+			})
+		end,
+	},
+	nvtt = {
+		compile_settings = function()
+			if not _OPTIONS["with-system-nvtt"] then
+				add_source_include_paths("nvtt")
+			end
+			defines { "NVTT_SHARED=1" }
+		end,
+		link_settings = function()
+			if not _OPTIONS["with-system-nvtt"] then
+				add_source_lib_paths("nvtt")
+			end
+			add_default_links({
+				win_names  = { "nvtt" },
+				unix_names = { "nvcore", "nvmath", "nvimage", "nvtt" },
+				osx_names = { "nvcore", "nvmath", "nvimage", "nvtt", "squish" },
+				dbg_suffix = "", -- for performance we always use the release-mode version
+			})
+		end,
+	},
+	openal = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("openal")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("openal")
+			end
+			add_default_links({
+				win_names  = { "openal32" },
+				unix_names = { "openal" },
+				osx_frameworks = { "OpenAL" },
+				dbg_suffix = "",
+				no_delayload = 1, -- delayload seems to cause errors on startup
+			})
+		end,
+	},
+	opengl = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("opengl")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("opengl")
+			end
+			if _OPTIONS["gles"] then
+				add_default_links({
+					unix_names = { "GLESv2" },
+					dbg_suffix = "",
+				})
+			else
+				add_default_links({
+					win_names  = { "opengl32", "gdi32" },
+					unix_names = { "GL" },
+					osx_frameworks = { "OpenGL" },
+					dbg_suffix = "",
+					no_delayload = 1, -- delayload seems to cause errors on startup
+				})
+			end
+		end,
+	},
+	sdl = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				includedirs { libraries_dir .. "sdl2/include/SDL" }
+			elseif not _OPTIONS["android"] then
+				-- Support SDL2_CONFIG for overriding the default PATH-based sdl2-config
+				sdl_config_path = os.getenv("SDL2_CONFIG")
+				if not sdl_config_path then
+					sdl_config_path = "sdl2-config"
+				end
+
+				pkgconfig.add_includes(nil, sdl_config_path.." --cflags")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("sdl2")
+			elseif not _OPTIONS["android"] then
+				sdl_config_path = os.getenv("SDL2_CONFIG")
+				if not sdl_config_path then
+					sdl_config_path = "sdl2-config"
+				end
+				pkgconfig.add_links(nil, sdl_config_path.." --libs")
+			end
+		end,
+	},
+	spidermonkey = {
+		compile_settings = function()
+			if _OPTIONS["with-system-mozjs38"] then
+				if not _OPTIONS["android"] then
+					pkgconfig.add_includes("mozjs-38")
+				end
+			else
+				if os.istarget("windows") then
+					include_dir = "include-win32"
+					buildoptions { "/FI\"js/RequiredDefines.h\"" }
+				else
+					include_dir = "include-unix"
+				end
+				filter "Debug"
+					sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-debug" }
+					defines { "DEBUG" }
+				filter "Release"
+					sysincludedirs { libraries_source_dir.."spidermonkey/"..include_dir.."-release" }
+				filter { }
+			end
+		end,
+		link_settings = function()
+			if _OPTIONS["with-system-mozjs38"] then
+				if _OPTIONS["android"] then
+					links { "mozjs-38" }
+				else
+					pkgconfig.add_links("nspr")
+					pkgconfig.add_links("mozjs-38")
+				end
+			else
+				if os.istarget("macosx") then
+					add_default_lib_paths("nspr")
+					links { "nspr4", "plc4", "plds4" }
+				end
+				filter "Debug"
+					links { "mozjs38-ps-debug" }
+				filter "Release"
+					links { "mozjs38-ps-release" }
+				filter { }
+				add_source_lib_paths("spidermonkey")
+			end
+		end,
+	},
+	tinygettext = {
+		compile_settings = function()
+			add_third_party_include_paths("tinygettext")
+		end,
+	},
+	valgrind = {
+		compile_settings = function()
+			add_source_include_paths("valgrind")
+		end,
+	},
+	vorbis = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				add_default_include_paths("vorbis")
+			elseif os.istarget("macosx") then
+				add_default_include_paths("libogg")
+				add_default_include_paths("vorbis")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				add_default_lib_paths("vorbis")
+			elseif os.istarget("macosx") then
+				add_default_lib_paths("libogg")
+				add_default_lib_paths("vorbis")
+			end
+			-- TODO: We need to force linking with these as currently
+			-- they need to be loaded explicitly on execution
+			if os.getversion().description == "OpenBSD" then
+				add_default_links({
+					unix_names = { "ogg",
+						"vorbis" },
+				})
+			end
+			add_default_links({
+				win_names  = { "vorbisfile" },
+				unix_names = { "vorbisfile" },
+				osx_names = { "vorbis", "vorbisenc", "vorbisfile", "ogg" },
+				dbg_suffix = "_d",
+			})
+		end,
+	},
+	wxwidgets = {
+		compile_settings = function()
+			if os.istarget("windows") then
+				includedirs { libraries_dir.."wxwidgets/include/msvc" }
+				add_default_include_paths("wxwidgets")
+			else
+
+				-- Support WX_CONFIG for overriding for the default PATH-based wx-config
+				wx_config_path = os.getenv("WX_CONFIG")
+				if not wx_config_path then
+					wx_config_path = "wx-config"
+				end
+
+				pkgconfig.add_includes(nil, wx_config_path.." --unicode=yes --cxxflags")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") then
+				libdirs { libraries_dir.."wxwidgets/lib/vc_lib" }
+			else
+				wx_config_path = os.getenv("WX_CONFIG")
+				if not wx_config_path then
+					wx_config_path = "wx-config"
+				end
+				pkgconfig.add_links(nil, wx_config_path.." --unicode=yes --libs std,gl")
+			end
+		end,
+	},
+	x11 = {
+		link_settings = function()
+			add_default_links({
+				win_names  = { },
+				unix_names = { "X11" },
+			})
+		end,
+	},
+	xcursor = {
+		link_settings = function()
+			add_default_links({
+				unix_names = { "Xcursor" },
+			})
+		end,
+	},
+	zlib = {
+		compile_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_include_paths("zlib")
+			end
+		end,
+		link_settings = function()
+			if os.istarget("windows") or os.istarget("macosx") then
+				add_default_lib_paths("zlib")
+			end
+			add_default_links({
+				win_names  = { "zlib1" },
+				unix_names = { "z" },
+				no_delayload = 1,
+			})
+		end,
+	},
+}
+
+
+-- add a set of external libraries to the project; takes care of
+-- include / lib path and linking against the import library.
+-- extern_libs: table of library names [string]
+-- target_type: String defining the projects kind [string]
+function project_add_extern_libs(extern_libs, target_type)
+
+	for i,extern_lib in pairs(extern_libs) do
+		local def = extern_lib_defs[extern_lib]
+		assert(def, "external library " .. extern_lib .. " not defined")
+
+		if def.compile_settings then
+			def.compile_settings()
+		end
+
+		-- Linking to external libraries will only be done in the main executable and not in the
+		-- static libraries. Premake would silently skip linking into static libraries for some
+		-- actions anyway (e.g. vs2010).
+		-- On osx using xcode, if this linking would be defined in the static libraries, it would fail to
+		-- link if only dylibs are available. If both *.a and *.dylib are available, it would link statically.
+		-- I couldn't find any problems with that approach.
+		if target_type ~= "StaticLib" and def.link_settings then
+			def.link_settings()
+		end
+	end
+end

build/premake/pkgconfig/README.md

@@ -0,0 +1,12 @@
+This premake module adds supports for pkgconfig.
+
+It allows one to use the `pkg-config` command (or an alternative one like
+`sdl2-config` to determine the names of libraries to be passed to the linker.
+
+The solution of putting directly the output (like "-Lxml2") into the linker
+options creates an inconsistency between libraries using pkgconfig and the
+libraries not using it.
+
+We should always use premake's linkoptions to specify global options and
+links to specify libraries, in order to avoid ordering problems in the
+list of libraries statically linked.

build/premake/pkgconfig/pkgconfig.lua

@@ -0,0 +1,61 @@
+local m = {}
+m._VERSION = "1.0.0-dev"
+
+local function os_capture(cmd)
+	return io.popen(cmd, 'r'):read('*a'):gsub("\n", " ")
+end
+
+function m.add_includes(lib, alternative_cmd)
+	local result
+	if not alternative_cmd then
+		result = os_capture("pkg-config --cflags "..lib)
+	else
+		result = os_capture(alternative_cmd)
+	end
+
+	local dirs = {}
+	local options = {}
+	for w in string.gmatch(result, "[^' ']+") do
+		if string.sub(w,1,2) == "-I" then
+			table.insert(dirs, string.sub(w,3))
+		else
+			table.insert(options, w)
+		end
+	end
+
+	sysincludedirs(dirs)
+	buildoptions(options)
+end
+
+function m.add_links(lib, alternative_cmd)
+	local result
+	if not alternative_cmd then
+		result = os_capture("pkg-config --libs "..lib)
+	else
+		result = os_capture(alternative_cmd)
+	end
+
+	-- On OSX, wx-config outputs "-framework foo" instead of "-Wl,-framework,foo"
+	-- which doesn't fare well with the splitting into libs, libdirs and options
+	-- we perform afterwards.
+	result = result:gsub("%-framework +(%g+)", "-Wl,-framework,%1")
+
+	local libs = {}
+	local dirs = {}
+	local options = {}
+	for w in string.gmatch(result, "[^' ']+") do
+		if string.sub(w,1,2) == "-l" then
+			table.insert(libs, string.sub(w,3))
+		elseif string.sub(w,1,2) == "-L" then
+			table.insert(dirs, string.sub(w,3))
+		else
+			table.insert(options, w)
+		end
+	end
+
+	links(libs)
+	libdirs(dirs)
+	linkoptions(options)
+end
+
+return m

build/workspaces/clean-workspaces.sh

@@ -44,6 +44,9 @@ fi
 (cd ../premake/premake4/build/gmake.bsd && ${MAKE} clean)
 (cd ../premake/premake4/build/gmake.macosx && ${MAKE} clean)
 (cd ../premake/premake4/build/gmake.unix && ${MAKE} clean)
+(cd ../premake/premake5/build/gmake.bsd && ${MAKE} clean)
+(cd ../premake/premake5/build/gmake.macosx && ${MAKE} clean)
+(cd ../premake/premake5/build/gmake.unix && ${MAKE} clean)
 
 echo "Removing generated test files..."
 

build/workspaces/update-workspaces.bat

@@ -2,6 +2,5 @@
 rem ** Create Visual Studio Workspaces on Windows **
 
 cd ..\premake
-rem ** Support for Visual Studio versions <2013 has been dropped (check #2669).
-if not exist ..\workspaces\vc2013\SKIP_PREMAKE_HERE premake4\bin\release\premake4 --outpath="../workspaces/vc2013" --collada --use-shared-glooxwrapper %* vs2013
+if not exist ..\workspaces\vc2013\SKIP_PREMAKE_HERE premake5\bin\release\premake5 --outpath="../workspaces/vc2013" --use-shared-glooxwrapper %* vs2013
 cd ..\workspaces

build/workspaces/update-workspaces.sh

@@ -36,6 +36,7 @@ esac
 
 # Parse command-line options:
 
+premake_version="premake5"
 premake_args=""
 
 without_nvtt=false
@@ -51,13 +52,13 @@ do
     --with-system-mozjs38 ) with_system_mozjs38=true; premake_args="${premake_args} --with-system-mozjs38" ;;
     --enable-atlas ) enable_atlas=true ;;
     --disable-atlas ) enable_atlas=false ;;
+    --premake4 ) premake_version="premake4"; premake_args="${premake_args} --collada" ;;
     -j* ) JOBS=$i ;;
     # Assume any other --options are for Premake
     --* ) premake_args="${premake_args} $i" ;;
   esac
 done
 
-premake_args="${premake_args} --collada"
 if [ "$enable_atlas" = "true" ]; then
   premake_args="${premake_args} --atlas"
 fi
@@ -94,7 +95,7 @@ if [ "`uname -s`" != "Darwin" ]; then
 fi
 
 # Now build premake and run it to create the makefiles
-cd ../premake/premake4
+cd ../premake/"$premake_version"
 PREMAKE_BUILD_DIR=build/gmake.unix
 # BSD and OS X need different Makefiles
 case "`uname -s`" in
@@ -119,13 +120,16 @@ export HOSTTYPE="$HOSTTYPE"
 
 echo "Premake args: ${premake_args}"
 
-premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
-premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
-
+"$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/gcc/" ${premake_args} gmake || die "Premake failed"
+if [ "$premake_version" = "premake4" ]; then
+  "$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/codeblocks/" ${premake_args} codeblocks || die "Premake failed"
+fi
 # Also generate xcode workspaces if on OS X
 if [ "`uname -s`" = "Darwin" ]; then
-  premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/xcode3" ${premake_args} xcode3 || die "Premake failed"
-  premake4/bin/release/premake4 --file="premake4.lua" --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
+  if [ "$premake_version" = "premake4" ]; then
+    "$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/xcode3" ${premake_args} xcode3 || die "Premake failed"
+  fi
+  "$premake_version"/bin/release/"$premake_version" --file="$premake_version.lua" --outpath="../workspaces/xcode4" ${premake_args} xcode4 || die "Premake failed"
 fi
 
 # test_root.cpp gets generated by cxxtestgen and passing different arguments to premake could require a regeneration of this file.

source/tools/atlas/AtlasFrontends/ActorEditor.cpp

@@ -20,7 +20,7 @@
 # define WIN32_LEAN_AND_MEAN
 # include <windows.h>
 
-/* Don't use pragmas here to set the manifests, instead do this in premake4.lua
+/* Don't use pragmas here to set the manifests, instead do this in premake.lua
  * since pragmas get ignored by the autobuilder
  * (see comments in lib\sysdep\os\win\manifest.cpp)
  */