Advertisement
orgads

Untitled

Mar 20th, 2012
98
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.50 KB | None | 0 0
  1. diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs
  2. index ad8b060..a4544f5 100644
  3. --- a/src/libs/symbianutils/symbianutils.qbs
  4. +++ b/src/libs/symbianutils/symbianutils.qbs
  5. @@ -12,6 +12,7 @@ DynamicLibrary {
  6.      ]
  7.      cpp.defines: [
  8.          "SYMBIANUTILS_BUILD_LIB",
  9. +        "JSON_BUILD_LIB",
  10.          "HAS_SERIALPORT"
  11.      ]
  12.      cpp.optimization: "fast"
  13. @@ -59,6 +60,9 @@ DynamicLibrary {
  14.              "../../shared/json",
  15.              "."
  16.          ]
  17. +        cpp.defines: [
  18. +            "JSON_INCLUDE_PRI"
  19. +        ]
  20.      }
  21.  }
  22.  
  23. diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs
  24. index f6415d0..19970a8 100644
  25. --- a/src/libs/zeroconf/zeroconf.qbs
  26. +++ b/src/libs/zeroconf/zeroconf.qbs
  27. @@ -8,9 +8,10 @@ DynamicLibrary {
  28.      Depends { name: "Qt.network" }
  29.  
  30.      cpp.includePaths: "."
  31. +    cpp.defines: "ZEROCONF_LIBRARY"
  32.      Properties {
  33.          condition: qbs.targetOS == "windows"
  34. -        cpp.dynamicLibraries:  "ws2_32"
  35. +        cpp.dynamicLibraries:  "ws2_32.lib"
  36.      }
  37.      Properties {
  38.          condition: qbs.targetOS == "linux"
  39. diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
  40. index 6b38889..86772d1 100644
  41. --- a/src/plugins/debugger/debugger.qbs
  42. +++ b/src/plugins/debugger/debugger.qbs
  43. @@ -284,6 +284,7 @@ QtcPlugin {
  44.              "shared/peutils.cpp",
  45.              "shared/peutils.h"
  46.          ]
  47. +        cpp.dynamicLibraries: "advapi32.lib"
  48.      }
  49.  
  50.      Group {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement