Differential D1029 Diff 5694 build/premake/premake5.lua

Changeset View

Standalone View

build/premake/premake5.lua

Show First 20 Lines • Show All 711 Lines • ▼ Show 20 Lines	extern_libs = {
"opengl",		"opengl",
"zlib",		"zlib",
"boost",		"boost",
"enet",		"enet",
"libcurl",		"libcurl",
"tinygettext",		"tinygettext",
"icu",		"icu",
"iconv",		"iconv",
}		}
		leperUnsubmitted Not Done Inline Actions In a few places sorting the entries might be a good idea at some point. leper: In a few places sorting the entries might be a good idea at some point.

if not _OPTIONS["without-audio"] then		if not _OPTIONS["without-audio"] then
table.insert(extern_libs, "openal")		table.insert(extern_libs, "openal")
table.insert(extern_libs, "vorbis")		table.insert(extern_libs, "vorbis")
end		end

setup_static_lib_project("engine", source_dirs, extern_libs, {})		setup_static_lib_project("engine", source_dirs, extern_libs, {})

▲ Show 20 Lines • Show All 175 Lines • ▼ Show 20 Lines	used_extern_libs = {
"boost",		"boost",
"cxxtest",		"cxxtest",
"comsuppw",		"comsuppw",
"enet",		"enet",
"libcurl",		"libcurl",
"tinygettext",		"tinygettext",
"icu",		"icu",
"iconv",		"iconv",
		"libsodium",
		ItmsAuthorUnsubmitted Done Inline Actions This needs to be added to the engine project as well, else compilation fails on Windows. Itms: This needs to be added to the engine project as well, else compilation fails on Windows.
		leperUnsubmitted Not Done Inline Actions Actually also had it there in some previous iteration, but I figured it wasn't needed. Added. leper: Actually also had it there in some previous iteration, but I figured it wasn't needed. Added.

"valgrind",		"valgrind",
}		}

if not os.istarget("windows") and not _OPTIONS["android"] and not os.istarget("macosx") then		if not os.istarget("windows") and not _OPTIONS["android"] and not os.istarget("macosx") then
-- X11 should only be linked on *nix		-- X11 should only be linked on *nix
table.insert(used_extern_libs, "x11")		table.insert(used_extern_libs, "x11")
table.insert(used_extern_libs, "xcursor")		table.insert(used_extern_libs, "xcursor")
▲ Show 20 Lines • Show All 538 Lines • Show Last 20 Lines