0ad/system-tinygettext.patch

86 lines
2.9 KiB
Diff

diff -Pdpru 0ad-0.0.21-alpha.orig/build/premake/extern_libs4.lua 0ad-0.0.21-alpha/build/premake/extern_libs4.lua
--- 0ad-0.0.21-alpha.orig/build/premake/extern_libs4.lua 2016-09-02 18:18:57.000000000 +0200
+++ 0ad-0.0.21-alpha/build/premake/extern_libs4.lua 2016-12-07 11:21:54.000000000 +0100
@@ -634,7 +634,16 @@ extern_lib_defs = {
},
tinygettext = {
compile_settings = function()
- add_third_party_include_paths("tinygettext")
+ if _OPTIONS["with-system-tinygettext"] then
+ pkgconfig_cflags("tinygettext")
+ else
+ add_third_party_include_paths("tinygettext")
+ end
+ end,
+ link_settings = function()
+ if _OPTIONS["with-system-tinygettext"] then
+ pkgconfig_libs("tinygettext")
+ end
end,
},
valgrind = {
diff -Pdpru 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 0ad-0.0.21-alpha/build/premake/premake4.lua
--- 0ad-0.0.21-alpha.orig/build/premake/premake4.lua 2016-09-18 10:54:27.000000000 +0200
+++ 0ad-0.0.21-alpha/build/premake/premake4.lua 2016-12-07 11:25:01.000000000 +0100
@@ -15,6 +15,7 @@ newoption { trigger = "without-miniupnpc
newoption { trigger = "without-nvtt", description = "Disable use of NVTT" }
newoption { trigger = "without-pch", description = "Disable generation and usage of precompiled headers" }
newoption { trigger = "without-tests", description = "Disable generation of test projects" }
+newoption { trigger = "with-system-tinygettext", description = "Search standard paths for tinygettext, instead of using bundled copy" }
-- OS X specific options
newoption { trigger = "macosx-bundle", description = "Enable OSX bundle, the argument is the bundle identifier string (e.g. com.wildfiregames.0ad)" }
@@ -601,29 +602,32 @@ function setup_all_libs ()
end
setup_static_lib_project("network", source_dirs, extern_libs, {})
- source_dirs = {
- "third_party/tinygettext/src",
- }
- extern_libs = {
- "iconv",
- "boost",
- }
- setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
-
- -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
- if _ACTION == "vs2013" then
- buildoptions {
- "/wd4127",
- "/wd4309",
- "/wd4800",
- "/wd4100",
- "/wd4996",
- "/wd4099",
- "/wd4503"
+ if _OPTIONS["with-system-tinygettext"] then
+ table.insert(extern_libs, "tinygettext")
+ else
+ source_dirs = {
+ "third_party/tinygettext/src",
}
+ extern_libs = {
+ "iconv",
+ "boost",
+ }
+ setup_third_party_static_lib_project("tinygettext", source_dirs, extern_libs, { } )
+
+ -- it's an external library and we don't want to modify its source to fix warnings, so we just disable them to avoid noise in the compile output
+ if _ACTION == "vs2013" then
+ buildoptions {
+ "/wd4127",
+ "/wd4309",
+ "/wd4800",
+ "/wd4100",
+ "/wd4996",
+ "/wd4099",
+ "/wd4503"
+ }
+ end
end
-
if not _OPTIONS["without-lobby"] then
source_dirs = {
"lobby",