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 /lib/lib.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 'lib/lib.pro')
-rw-r--r-- | lib/lib.pro | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/lib.pro b/lib/lib.pro index fbd5bbb13..48fe29fcd 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -8,8 +8,10 @@ TEMPLATE = lib TARGET = blinq # Defining keywords such as 'signal' clashes with the chromium code base. -DEFINES += QT_NO_KEYWORDS \ - BLINQ_PROCESS_PATH=\\\"$$getOutDir()/$$BLINQ_PROCESS_NAME\\\" +DEFINES += QT_NO_KEYWORDS + +# We need a way to tap into gyp's Debug vs. Release configuration +PER_CONFIG_DEFINES = BLINQ_PROCESS_PATH=\\\"$$getOutDir()/%config/$$BLINQ_PROCESS_NAME\\\" # Keep Skia happy CONFIG(release, debug|release): DEFINES += NDEBUG |