feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix compilation on Windows 64bit, MinGW

Browse Source 
- 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 <fawzi.mohamed@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-03-16 11:41:21 +01:00
parent 2386d701b6
commit 707cff7b73
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/mdnssd/mdnssd.pro
View File

@@ -88,7 +88,7 @@ win32 {
$$MC_FILES \ $$MC_FILES \
Service.rc 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 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 mc.output = ${QMAKE_FILE_BASE}.h

2
src/tools/tools.pro
View File

@@ -5,7 +5,7 @@ SUBDIRS = qtpromaker \
win32 { win32 {
SUBDIRS += qtcdebugger SUBDIRS += qtcdebugger
SUBDIRS += mdnssd !*g++*:SUBDIRS += mdnssd
# win64interrupt only make sense for 64bit builds # win64interrupt only make sense for 64bit builds
ENV_CPU=$$(CPU) ENV_CPU=$$(CPU)
ENV_LIBPATH=$$(LIBPATH) ENV_LIBPATH=$$(LIBPATH)