c9406bcffe
When embedding manifests we modified the EXE/DLL after linking using
the manifest tool. This breaks the incremental linking feature of MSVC.
The MS way to embed a manifest without breaking incremental linking is:
- let the linker create the manifest file,
- create a resource that contains the manifest file,
- invoke the linker again to embed the resource.
The embed_manifest_{exe|dll}.prf files have been removed.
All manifest logic is now in qmake's nmake makefile generator.
With QMAKE_MANIFEST one can specify a custom manifest file that gets
embedded without disturbing incremental linking.
Task-number: QTBUG-22718
Change-Id: Idb9d2644a0577b2002cbdd2d62b695b9171b1bd5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
81 lines
2.7 KiB
C++
81 lines
2.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/
|
|
**
|
|
** This file is part of the qmake application of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
|
** GNU Lesser General Public License Usage
|
|
** This file may be used under the terms of the GNU Lesser General Public
|
|
** License version 2.1 as published by the Free Software Foundation and
|
|
** appearing in the file LICENSE.LGPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU Lesser
|
|
** General Public License version 2.1 requirements will be met:
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, Nokia gives you certain additional
|
|
** rights. These rights are described in the Nokia Qt LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** GNU General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU General
|
|
** Public License version 3.0 as published by the Free Software Foundation
|
|
** and appearing in the file LICENSE.GPL included in the packaging of this
|
|
** file. Please review the following information to ensure the GNU General
|
|
** Public License version 3.0 requirements will be met:
|
|
** http://www.gnu.org/copyleft/gpl.html.
|
|
**
|
|
** Other Usage
|
|
** Alternatively, this file may be used in accordance with the terms and
|
|
** conditions contained in a signed written agreement between you and Nokia.
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#ifndef MSVC_NMAKE_H
|
|
#define MSVC_NMAKE_H
|
|
|
|
#include "winmakefile.h"
|
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
class NmakeMakefileGenerator : public Win32MakefileGenerator
|
|
{
|
|
bool init_flag;
|
|
void writeNmakeParts(QTextStream &);
|
|
bool writeMakefile(QTextStream &);
|
|
void writeImplicitRulesPart(QTextStream &t);
|
|
void writeBuildRulesPart(QTextStream &t);
|
|
void writeLinkCommand(QTextStream &t, const QString &extraFlags = QString(), const QString &extraInlineFileContent = QString());
|
|
void init();
|
|
|
|
protected:
|
|
virtual void writeSubMakeCall(QTextStream &t, const QString &callPrefix,
|
|
const QString &makeArguments);
|
|
virtual QString getPdbTarget();
|
|
virtual QString defaultInstall(const QString &t);
|
|
virtual QStringList &findDependencies(const QString &file);
|
|
QString var(const QString &value);
|
|
QString precompH, precompObj, precompPch;
|
|
bool usePCH;
|
|
|
|
public:
|
|
NmakeMakefileGenerator();
|
|
~NmakeMakefileGenerator();
|
|
|
|
};
|
|
|
|
inline NmakeMakefileGenerator::~NmakeMakefileGenerator()
|
|
{ }
|
|
|
|
QT_END_NAMESPACE
|
|
|
|
#endif // MSVC_NMAKE_H
|