From ee2baf882eab488342196a799fe9502bdd5c3c1d Mon Sep 17 00:00:00 2001 From: Tobias Markmann Date: Tue, 26 Apr 2016 16:17:39 +0200 Subject: Fix scons2ninja.py due to recent change in RCC usage Test-Information: Successfully ran ./BuildTools/scons2ninja.py and ninja on OS X 10.11.4. Change-Id: I725182a0628dec7e9237e802e009da0f6b4a50c2 diff --git a/BuildTools/scons2ninja.py b/BuildTools/scons2ninja.py index 91cd3cc..6c77c88 100755 --- a/BuildTools/scons2ninja.py +++ b/BuildTools/scons2ninja.py @@ -565,9 +565,11 @@ for line in build_lines : elif tool == 'rcc': out, flags = extract_binary_flag("-o", flags) name, flags = extract_binary_flag("-name", flags) + compress, flags = extract_binary_flag("--compress", flags) + threshold, flags = extract_binary_flag("--threshold", flags) files, flags = extract_non_flags(flags) deps = list(set(get_dependencies(out, ninja.targets)) - set(files)) - ninja.build(out, 'rcc', files, deps = sorted(deps), name = name, rccflags = flags) + ninja.build(out, 'rcc', files, deps = sorted(deps), name = name, rccflags = ["--compress", compress, "--threshold", threshold]) ############################################################ # OS X tools -- cgit v0.10.2-6-g49f6