|
|
@ -343,7 +343,7 @@ UnixMakefileGenerator::init()
|
|
|
|
if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
|
|
|
|
if(libtoolify[i].startsWith("QMAKE_LINK") || libtoolify[i] == "QMAKE_AR_CMD") {
|
|
|
|
libtool_flags += " --mode=link";
|
|
|
|
libtool_flags += " --mode=link";
|
|
|
|
if(project->isActiveConfig("staticlib")) {
|
|
|
|
if(project->isActiveConfig("staticlib")) {
|
|
|
|
libtool_flags += " -static";
|
|
|
|
comp_flags += " -static";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if(!project->isEmpty("QMAKE_LIB_FLAG")) {
|
|
|
|
if(!project->isEmpty("QMAKE_LIB_FLAG")) {
|
|
|
|
int maj = project->first("VER_MAJ").toInt();
|
|
|
|
int maj = project->first("VER_MAJ").toInt();
|
|
|
@ -363,7 +363,7 @@ UnixMakefileGenerator::init()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(project->isActiveConfig("plugin"))
|
|
|
|
if(project->isActiveConfig("plugin"))
|
|
|
|
libtool_flags += " -module";
|
|
|
|
comp_flags += " -module";
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
libtool_flags += " --mode=compile";
|
|
|
|
libtool_flags += " --mode=compile";
|
|
|
|
}
|
|
|
|
}
|
|
|
|