From 707cff7b73bc1d8e8a96c3f26a1a902ae8fb5edf Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 16 Mar 2012 11:41:21 +0100 Subject: [PATCH] Fix compilation on Windows 64bit, MinGW - Fix C1189: #error: You cannot use 32-bit time_t (_USE_32BIT_TIME_T) with _WIN64. - Exclude mdnssd for MinGW since it does not have mc.exe Change-Id: I45ddee7da827e9586a52c23474f3ad0423f17f52 Reviewed-by: Fawzi Mohamed --- src/tools/mdnssd/mdnssd.pro | 2 +- src/tools/tools.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/mdnssd/mdnssd.pro b/src/tools/mdnssd/mdnssd.pro index aaef6adba21..cd1fb378c01 100644 --- a/src/tools/mdnssd/mdnssd.pro +++ b/src/tools/mdnssd/mdnssd.pro @@ -88,7 +88,7 @@ win32 { $$MC_FILES \ Service.rc - DEFINES += HAVE_IPV6 _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_ _USE_32BIT_TIME_T + DEFINES += HAVE_IPV6 _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_ LIBS += ws2_32.lib advapi32.lib ole32.lib oleaut32.lib iphlpapi.lib netapi32.lib user32.lib powrprof.lib shell32.lib mc.output = ${QMAKE_FILE_BASE}.h diff --git a/src/tools/tools.pro b/src/tools/tools.pro index 956babc589f..648638f7063 100644 --- a/src/tools/tools.pro +++ b/src/tools/tools.pro @@ -5,7 +5,7 @@ SUBDIRS = qtpromaker \ win32 { SUBDIRS += qtcdebugger - SUBDIRS += mdnssd + !*g++*:SUBDIRS += mdnssd # win64interrupt only make sense for 64bit builds ENV_CPU=$$(CPU) ENV_LIBPATH=$$(LIBPATH)