1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Define _WINDLL when building a DLL

Browse Source 
Visual Studio automatically defines _WINDLL when building a DLL,
regardless of project settings
(https://msdn.microsoft.com/en-us/library/8x480de8.aspx). This define
is therefore widely used to detect DLL vs. static library or executable
build target on Windows.

For makefiles, _WINDLL need to be manually defined, which QMake failed
to do so far.

Task-number: QTBUG-55183
Change-Id: Ic62201666c44e730e6881706d568ce9eaf22b7a4
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
This commit is contained in:
Fredrik Orderud 2016-08-08 22:39:00 +02:00
parent 0681e60380
commit b6f5b38f8c
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/win32/msvc_nmake.cpp
View File

@ -426,6 +426,12 @@ void NmakeMakefileGenerator::init()
if (!defines.contains("NDEBUG")) if (!defines.contains("NDEBUG"))
defines.append("NDEBUG"); defines.append("NDEBUG");
} }
if (project->values("QMAKE_APP_FLAG").isEmpty() && project->isActiveConfig("dll")) {
ProStringList &defines = project->values("DEFINES");
if (!defines.contains("_WINDLL"))
defines.append("_WINDLL");
}
} }
QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter() QStringList NmakeMakefileGenerator::sourceFilesForImplicitRulesFilter()