From: Markus Koschany Date: Sun, 30 Aug 2020 15:59:13 +0200 Subject: system-libs Use system libraries. --- bam.lua | 48 ++++++++++++++++++++++++--- src/engine/client/serverbrowser.cpp | 2 +- src/engine/client/sound.cpp | 2 +- src/game/client/components/countryflags.cpp | 2 +- src/game/client/components/menus_browser.cpp | 2 +- src/game/client/components/menus_settings.cpp | 2 +- src/game/client/components/skins.cpp | 2 +- src/game/client/localization.cpp | 2 +- src/game/editor/auto_map.h | 2 +- 9 files changed, 51 insertions(+), 13 deletions(-) diff --git a/bam.lua b/bam.lua index 4d89ef9..c74c80a 100644 --- a/bam.lua +++ b/bam.lua @@ -13,6 +13,9 @@ config:Add(OptTestCompileC("buildwithoutsseflag", "#include \nint m config:Add(OptLibrary("zlib", "zlib.h", false)) config:Add(SDL.OptFind("sdl", true)) config:Add(FreeType.OptFind("freetype", true)) +config:Add(OptLibrary("pnglite", "pnglite.h", false)) +config:Add(OptLibrary("wavpack", "wavpack/wavpack.h", false)) +config:Add(OptLibrary("jsonparser", "json-parser/json.h", false)) config:Finalize("config.lua") generated_src_dir = "build/src" @@ -86,10 +89,15 @@ function GenerateCommonSettings(settings, conf, arch, compiler) if compiler == "gcc" or compiler == "clang" then settings.cc.flags:Add("-Wall", "-fno-exceptions") end - + local debian_cflags = os.getenv("CFLAGS") + local debian_cppflags = os.getenv("CPPFLAGS") + local debian_ldflags = os.getenv("LDFLAGS") + settings.cc.flags:Add(debian_cflags) + settings.cc.flags:Add(debian_cppflags) + settings.link.flags:Add(debian_ldflags) -- Compile zlib if needed local zlib = nil - if config.zlib.value == 1 then + if config.zlib.value then settings.link.libs:Add("z") if config.zlib.include_path then settings.cc.includes:Add(config.zlib.include_path) @@ -100,9 +108,39 @@ function GenerateCommonSettings(settings, conf, arch, compiler) end local md5 = Compile(settings, Collect("src/engine/external/md5/*.c")) - local wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) - local png = Compile(settings, Collect("src/engine/external/pnglite/*.c")) - local json = Compile(settings, Collect("src/engine/external/json-parser/*.c")) + -- compile wavpack if needed + if config.wavpack.value then + settings.link.libs:Add("wavpack") + if config.wavpack.include_path then + settings.cc.includes:Add(config.wavpack.include_path) + end + wavpack = {} + else + wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c")) + settings.cc.includes:Add("src/engine/external") + end + -- compile pnglite if needed + if config.pnglite.value then + settings.link.libs:Add("pnglite") + if config.pnglite.include_path then + settings.cc.includes:Add(config.pnglite.include_path) + end + pnglite = {} + else + pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c")) + settings.cc.includes:Add("src/engine/external/pnglite") + end +-- compile jsonparser if needed + if config.jsonparser.value then + settings.link.libs:Add("jsonparser") + if config.jsonparser.include_path then + settings.cc.includes:Add(config.jsonparser.include_path) + end + jsonparser = {} + else + jsonparser = Compile(settings, Collect("src/engine/external/json-parser/*.c")) + settings.cc.includes:Add("src/engine/external/json-parser") + end -- globally available libs libs = {zlib=zlib, wavpack=wavpack, png=png, md5=md5, json=json} diff --git a/src/engine/client/serverbrowser.cpp b/src/engine/client/serverbrowser.cpp index 767045c..69e7879 100644 --- a/src/engine/client/serverbrowser.cpp +++ b/src/engine/client/serverbrowser.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include diff --git a/src/engine/client/sound.cpp b/src/engine/client/sound.cpp index f5c126c..190763f 100644 --- a/src/engine/client/sound.cpp +++ b/src/engine/client/sound.cpp @@ -14,7 +14,7 @@ extern "C" { - #include + #include } #include diff --git a/src/game/client/components/countryflags.cpp b/src/game/client/components/countryflags.cpp index bf6a240..54a74d1 100644 --- a/src/game/client/components/countryflags.cpp +++ b/src/game/client/components/countryflags.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include "menus.h" diff --git a/src/game/client/components/menus_browser.cpp b/src/game/client/components/menus_browser.cpp index 851465e..9e76f25 100644 --- a/src/game/client/components/menus_browser.cpp +++ b/src/game/client/components/menus_browser.cpp @@ -2,7 +2,7 @@ /* If you are missing that file, acquire a complete release at teeworlds.com. */ #include // sort TODO: remove this -#include +#include #include #include diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index c4f5919..d389686 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/game/client/components/skins.cpp b/src/game/client/components/skins.cpp index 1086606..2bfd382 100644 --- a/src/game/client/components/skins.cpp +++ b/src/game/client/components/skins.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include diff --git a/src/game/client/localization.cpp b/src/game/client/localization.cpp index 84d4ff8..924241d 100644 --- a/src/game/client/localization.cpp +++ b/src/game/client/localization.cpp @@ -4,7 +4,7 @@ #include "localization.h" #include -#include +#include #include #include diff --git a/src/game/editor/auto_map.h b/src/game/editor/auto_map.h index 2e567f1..499a8e9 100644 --- a/src/game/editor/auto_map.h +++ b/src/game/editor/auto_map.h @@ -4,7 +4,7 @@ #include #include -#include +#include typedef struct {