Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs
- index 3386128..7fe9388 100644
- --- a/src/libs/3rdparty/botan/botan.qbs
- +++ b/src/libs/3rdparty/botan/botan.qbs
- @@ -8,28 +8,33 @@ DynamicLibrary {
- Depends { name: "qt"; submodules: 'core' }
- cpp.includePaths: ["build", "src"]
- - cpp.staticLibraries: {
- - if (qbs.targetOS == 'windows') {
- - return [
- - "advapi32.lib",
- - "user32.lib"
- - ]
- - }
- - }
- cpp.dynamicLibraries: {
- if (qbs.targetOS == 'linux' || qbs.targetOS == 'freebsd') {
- return ['rt']
- }
- + else if (qbs.targetOS == 'windows') {
- + return [
- + "advapi32",
- + "user32"
- + ]
- + }
- }
- cpp.defines: {
- var result = []
- - if (qbs.toolchain == 'msvc2005' || qbs.toolchain == 'msvc2005' || qbs.toolchain == 'msvc2008' || qbs.toolchain == 'msvc2010')
- + if (qbs.toolchain == 'msvc2005' || qbs.toolchain == 'msvc2008' || qbs.toolchain == 'msvc2010')
- result.push('BOTAN_DLL=__declspec(dllexport)')
- return result
- }
- - // TODO: add those flags to mingw's compiler: -fpermissive -finline-functions -Wno-long-long
- + Properties {
- + condition: qbs.toolchain === 'mingw'
- + cpp.cxxFlags: [
- + '-fpermissive',
- + '-finline-functions',
- + '-Wno-long-long'
- + ]
- + }
- files: [
- "src/algo_factory/algo_cache.h",
- @@ -536,4 +541,12 @@ DynamicLibrary {
- "src/timer/posix_rt/tm_posix.cpp"
- ]
- }
- +
- + ProductModule {
- + cpp.linkerFlags: {
- + if (qbs.toolchain === 'mingw') {
- + return ['--enable-auto-import']
- + }
- + }
- + }
- }
- diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs
- index ad8b060..7d1b014 100644
- --- a/src/libs/symbianutils/symbianutils.qbs
- +++ b/src/libs/symbianutils/symbianutils.qbs
- @@ -12,6 +12,7 @@ DynamicLibrary {
- ]
- cpp.defines: [
- "SYMBIANUTILS_BUILD_LIB",
- + "JSON_BUILD_LIB",
- "HAS_SERIALPORT"
- ]
- cpp.optimization: "fast"
- @@ -59,6 +60,7 @@ DynamicLibrary {
- "../../shared/json",
- "."
- ]
- + cpp.defines: "JSON_INCLUDE_PRI"
- }
- }
- diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
- index c7fe39e..3f1b281 100644
- --- a/src/libs/utils/utils.qbs
- +++ b/src/libs/utils/utils.qbs
- @@ -14,7 +14,7 @@ DynamicLibrary {
- Properties {
- condition: qbs.targetOS == "windows"
- - cpp.dynamicLibraries: ["User32.lib"]
- + cpp.dynamicLibraries: ["user32"]
- }
- Depends { name: "cpp" }
- diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
- index f6415d0..8c4edee 100644
- --- a/src/libs/zeroconf/zeroconf.qbs
- +++ b/src/libs/zeroconf/zeroconf.qbs
- @@ -8,6 +8,7 @@ DynamicLibrary {
- Depends { name: "Qt.network" }
- cpp.includePaths: "."
- + cpp.defines: ["ZEROCONF_LIBRARY"]
- Properties {
- condition: qbs.targetOS == "windows"
- cpp.dynamicLibraries: "ws2_32"
- diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
- index d0fbcd5..476f346 100644
- --- a/src/plugins/coreplugin/coreplugin.qbs
- +++ b/src/plugins/coreplugin/coreplugin.qbs
- @@ -24,12 +24,6 @@ QtcPlugin {
- buildDirectory
- ]
- - cpp.staticLibraries: {
- - if (qbs.targetOS == 'windows') return [
- - "ole32.lib"
- - ]
- - }
- -
- files: [
- "fancyactionbar.qrc",
- "generalsettings.ui",
- @@ -225,6 +219,9 @@ QtcPlugin {
- files: [
- "progressmanager/progressmanager_win.cpp"
- ]
- + cpp.dynamicLibraries: [
- + "ole32"
- + ]
- }
- Group {
- diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
- index 6b38889..4cf39f7 100644
- --- a/src/plugins/debugger/debugger.qbs
- +++ b/src/plugins/debugger/debugger.qbs
- @@ -295,6 +295,15 @@ QtcPlugin {
- ]
- }
- + Properties {
- + condition: qbs.targetOS == "windows"
- + cpp.dynamicLibraries: [
- + "advapi32",
- + "ole32",
- + "shell32"
- + ]
- + }
- +
- ProductModule {
- cpp.includePaths: ["."]
- }
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement