equal
deleted
inserted
replaced
473 } |
473 } |
474 |
474 |
475 resFile.replace(".rc", Option::res_ext); |
475 resFile.replace(".rc", Option::res_ext); |
476 project->values("RES_FILE").prepend(fileInfo(resFile).fileName()); |
476 project->values("RES_FILE").prepend(fileInfo(resFile).fileName()); |
477 if (!project->values("OBJECTS_DIR").isEmpty()) { |
477 if (!project->values("OBJECTS_DIR").isEmpty()) { |
478 if(project->isActiveConfig("staticlib")) |
478 QString resDestDir; |
479 project->values("RES_FILE").first().prepend(fileInfo(project->values("DESTDIR").first()).absoluteFilePath() + Option::dir_sep); |
479 if (project->isActiveConfig("staticlib")) |
|
480 resDestDir = fileInfo(project->first("DESTDIR")).absoluteFilePath(); |
480 else |
481 else |
481 project->values("RES_FILE").first().prepend(project->values("OBJECTS_DIR").first() + Option::dir_sep); |
482 resDestDir = project->first("OBJECTS_DIR"); |
|
483 resDestDir.append(Option::dir_sep); |
|
484 project->values("RES_FILE").first().prepend(resDestDir); |
482 } |
485 } |
483 project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false); |
486 project->values("RES_FILE").first() = Option::fixPathToTargetOS(project->values("RES_FILE").first(), false, false); |
484 project->values("POST_TARGETDEPS") += project->values("RES_FILE"); |
487 project->values("POST_TARGETDEPS") += project->values("RES_FILE"); |
485 project->values("CLEAN_FILES") += project->values("RES_FILE"); |
488 project->values("CLEAN_FILES") += project->values("RES_FILE"); |
486 } |
489 } |