From b711b69f035a7a04d4037949ee628e81f8c6879a Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Mon, 4 Jun 2012 14:58:08 +0200
Subject: [PATCH] fix defines in mdnssd.qbs
The WIN32 define was missing on Windows.
Change-Id: I22243e9384b0957b22e5df9e6d916a3bdc57e70d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
---
src/tools/mdnssd/mdnssd.qbs | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/tools/mdnssd/mdnssd.qbs b/src/tools/mdnssd/mdnssd.qbs
index 5c273e39dc0..4808b0484ee 100644
--- a/src/tools/mdnssd/mdnssd.qbs
+++ b/src/tools/mdnssd/mdnssd.qbs
@@ -38,14 +38,18 @@ QtcTool {
Properties {
condition: qbs.targetOS === "linux"
- cpp.defines: [ "_GNU_SOURCE", , "NOT_HAVE_SA_LEN", "USES_NETLINK", "HAVE_LINUX",
- "TARGET_OS_LINUX" ]
+ cpp.defines: outer.concat([
+ "_GNU_SOURCE", "NOT_HAVE_SA_LEN",
+ "USES_NETLINK", "HAVE_LINUX", "TARGET_OS_LINUX"
+ ])
}
Properties {
condition: qbs.targetOS === "macx"
- cpp.defines: [ "__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4",
- "__APPLE_USE_RFC_2292" ]
+ cpp.defines: outer.concat([
+ "__MAC_OS_X_VERSION_MIN_REQUIRED=__MAC_OS_X_VERSION_10_4",
+ "__APPLE_USE_RFC_2292"
+ ])
}
Group {
@@ -69,11 +73,14 @@ QtcTool {
Properties {
condition: qbs.targetOS === "windows"
- cpp.defines: [ "_WIN32_WINNT=0x0501", "NDEBUG", "MDNS_DEBUGMSGS=0", "TARGET_OS_WIN32",
+ cpp.defines: outer.concat([
+ "WIN32",
+ "_WIN32_WINNT=0x0501", "NDEBUG", "MDNS_DEBUGMSGS=0", "TARGET_OS_WIN32",
"WIN32_LEAN_AND_MEAN", "USE_TCP_LOOPBACK", "PLATFORM_NO_STRSEP",
"PLATFORM_NO_EPIPE", "PLATFORM_NO_RLIMIT", "UNICODE", "_UNICODE",
"_CRT_SECURE_NO_DEPRECATE", "_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1",
- "_LEGACY_NAT_TRAVERSAL_" ]
+ "_LEGACY_NAT_TRAVERSAL_"
+ ])
cpp.dynamicLibraries: [ "ws2_32.lib", "advapi32.lib", "ole32.lib", "oleaut32.lib",
"iphlpapi.lib", "netapi32.lib", "user32.lib", "powrprof.lib", "shell32.lib" ]
}
--
GitLab