From 502b5b81784bd683b0571b1d72e76b3d786b98e1 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 24 Nov 2011 08:01:08 +0100 Subject: Make v8 snapshots work in debug-and-release mode Debug snapshots and release snapshots aren't compatible. Both a debug version and release version of the mkv8snapshot tool must be built, and the corresponding executable selected when building v8. Adopt the library naming convention for naming the mkv8snapshot executable ("mkv8snapshot" in release, "mkv8snapshot_debug" in debug on Mac, "mkv8snapshotd" in debug on Windows). Change-Id: I7a94b09e7db7ed8bbaa293637c092a1d1d1dbaba Reviewed-by: Oswald Buddenhagen --- src/tools/mkv8snapshot/mkv8snapshot.pro | 5 +++++ src/v8/v8.pro | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/tools/mkv8snapshot/mkv8snapshot.pro b/src/tools/mkv8snapshot/mkv8snapshot.pro index 8e80ce2635..8070b5426b 100644 --- a/src/tools/mkv8snapshot/mkv8snapshot.pro +++ b/src/tools/mkv8snapshot/mkv8snapshot.pro @@ -11,6 +11,11 @@ DEPENDPATH += . LIBS = OBJECTS_DIR = . +contains(QT_CONFIG, build_all): CONFIG += build_all +win32|mac:!macx-xcode: CONFIG += debug_and_release + +TARGET = $$TARGET$$qtPlatformTargetSuffix() + cross_compile { equals(QT_ARCH, arm): V8_TARGET_ARCH = arm } diff --git a/src/v8/v8.pro b/src/v8/v8.pro index 1bc542ee32..6f8ed703aa 100644 --- a/src/v8/v8.pro +++ b/src/v8/v8.pro @@ -27,7 +27,7 @@ HEADERS += $$QT_SOURCE_TREE/src/v8/qtv8version.h include(v8.pri) contains(QT_CONFIG, v8snapshot) { - mkv8snapshot.commands = ../../bin/mkv8snapshot ${QMAKE_FILE_OUT} + mkv8snapshot.commands = ../../bin/mkv8snapshot$$qtPlatformTargetSuffix() ${QMAKE_FILE_OUT} DUMMY_FILE = v8.pro mkv8snapshot.input = DUMMY_FILE mkv8snapshot.output = $$V8_GENERATED_SOURCES_DIR/snapshot.cpp -- cgit v1.2.3