diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2013-05-24 17:20:33 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-31 10:55:53 +0200 |
| commit | c5a19a2599298da6c1fc3d3602a1d9ef787704c6 (patch) | |
| tree | c938646373944999522889e63794808ef2c4ab6c /build/build.pro | |
| parent | 252c0e77614b8f2bfb2a4cb12287453df6653ffc (diff) | |
Ease the switching between Debug and Release builds
Change the semantics of getOutDir, introduce getConfigDir.
Rely on Gyp's configurations mechanism to get a sensible
path for the BLINQ_PROCESS_PATH in both cases.
Also make the build smarter in that re-generation of gyp files
will lead to re-gyping.
Diffstat (limited to 'build/build.pro')
| -rw-r--r-- | build/build.pro | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/build/build.pro b/build/build.pro index 83c074d60..0c3c87ba3 100644 --- a/build/build.pro +++ b/build/build.pro @@ -4,16 +4,12 @@ TEMPLATE = aux -# Fetched from environment for now -CHROMIUM_SRC_DIR = $$(CHROMIUM_SRC_DIR) -isEmpty(CHROMIUM_SRC_DIR):error("please set CHOMIUM_SRC_DIR") - message(Running Gyp...) GYP_OUTPUT = $$system(./gyp_blinq) message($$GYP_OUTPUT) ninja.target = ninja -ninja.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C $$getOutDir() +ninja.commands = $$CHROMIUM_SRC_DIR/../depot_tools/ninja -C $$getOutDir()/$$getConfigDir() ninja.depends: qmake QMAKE_EXTRA_TARGETS += ninja |