mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Remove _USE_32BIT_TIME_T windows define
Why did we added it in first place?
This commit is contained in:
parent
329050a9c2
commit
77d938bf52
@ -78,7 +78,7 @@ win32 {
|
|||||||
QMAKE_CC = $${QMAKE_CXX}
|
QMAKE_CC = $${QMAKE_CXX}
|
||||||
OBJECTS_DIR = temp/obj
|
OBJECTS_DIR = temp/obj
|
||||||
MOC_DIR = temp/moc
|
MOC_DIR = temp/moc
|
||||||
DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
|
DEFINES *= STATICLIB WIN32_LEAN_AND_MEAN
|
||||||
# These have been replaced by _WIN32 && __MINGW32__
|
# These have been replaced by _WIN32 && __MINGW32__
|
||||||
#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
|
#DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ win32-g++ {
|
|||||||
HEADERS += openpgpsdk/opsstring.h
|
HEADERS += openpgpsdk/opsstring.h
|
||||||
SOURCES += openpgpsdk/opsstring.c
|
SOURCES += openpgpsdk/opsstring.c
|
||||||
|
|
||||||
DEFINES *= WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
|
DEFINES *= WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
# Switch off optimization for release version
|
# Switch off optimization for release version
|
||||||
QMAKE_CXXFLAGS_RELEASE -= -O2
|
QMAKE_CXXFLAGS_RELEASE -= -O2
|
||||||
|
@ -44,7 +44,7 @@ win32 {
|
|||||||
RCC_DIR = temp/qrc
|
RCC_DIR = temp/qrc
|
||||||
UI_DIR = temp/ui
|
UI_DIR = temp/ui
|
||||||
|
|
||||||
DEFINES += WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
|
DEFINES += WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN
|
||||||
#DEFINES += MINIUPNPC_VERSION=13
|
#DEFINES += MINIUPNPC_VERSION=13
|
||||||
# DESTDIR = lib
|
# DESTDIR = lib
|
||||||
|
|
||||||
|
@ -531,7 +531,7 @@ win32-g++ {
|
|||||||
|
|
||||||
RS_UPNP_LIB = miniupnpc
|
RS_UPNP_LIB = miniupnpc
|
||||||
|
|
||||||
DEFINES *= NOGDI WIN32 WIN32_LEAN_AND_MEAN WINDOWS_SYS _USE_32BIT_TIME_T
|
DEFINES *= NOGDI WIN32 WIN32_LEAN_AND_MEAN WINDOWS_SYS
|
||||||
|
|
||||||
# This defines the platform to be WinXP or later and is needed for
|
# This defines the platform to be WinXP or later and is needed for
|
||||||
# getaddrinfo (_WIN32_WINNT_WINXP)
|
# getaddrinfo (_WIN32_WINNT_WINXP)
|
||||||
|
@ -44,8 +44,6 @@ win32 {
|
|||||||
|
|
||||||
CONFIG += dummy_glib
|
CONFIG += dummy_glib
|
||||||
|
|
||||||
DEFINES *= _USE_32BIT_TIME_T
|
|
||||||
|
|
||||||
# With GCC package 4.8, including io.h either directly or indirectly causes off64_t not to be defined when compiling with -ansi switch
|
# With GCC package 4.8, including io.h either directly or indirectly causes off64_t not to be defined when compiling with -ansi switch
|
||||||
DEFINES *= off64_t=_off64_t
|
DEFINES *= off64_t=_off64_t
|
||||||
DEFINES *= off_t=_off_t
|
DEFINES *= off_t=_off_t
|
||||||
|
@ -148,7 +148,7 @@ win32 {
|
|||||||
QMAKE_CC = $${QMAKE_CXX}
|
QMAKE_CC = $${QMAKE_CXX}
|
||||||
OBJECTS_DIR = temp/obj
|
OBJECTS_DIR = temp/obj
|
||||||
MOC_DIR = temp/moc
|
MOC_DIR = temp/moc
|
||||||
DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
|
DEFINES *= WINDOWS_SYS WIN32 STATICLIB MINGW WIN32_LEAN_AND_MEAN
|
||||||
DEFINES *= MINIUPNPC_VERSION=13
|
DEFINES *= MINIUPNPC_VERSION=13
|
||||||
# This defines the platform to be WinXP or later and is needed for getaddrinfo (_WIN32_WINNT_WINXP)
|
# This defines the platform to be WinXP or later and is needed for getaddrinfo (_WIN32_WINNT_WINXP)
|
||||||
DEFINES *= WINVER=0x0501
|
DEFINES *= WINVER=0x0501
|
||||||
|
@ -149,7 +149,7 @@ win32 {
|
|||||||
LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32
|
LIBS += -luuid -lole32 -liphlpapi -lcrypt32 -lgdi32
|
||||||
LIBS += -lwinmm
|
LIBS += -lwinmm
|
||||||
|
|
||||||
DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN _USE_32BIT_TIME_T
|
DEFINES *= WINDOWS_SYS WIN32_LEAN_AND_MEAN
|
||||||
|
|
||||||
# create lib directory
|
# create lib directory
|
||||||
message(CHK_DIR_EXISTS=$(CHK_DIR_EXISTS))
|
message(CHK_DIR_EXISTS=$(CHK_DIR_EXISTS))
|
||||||
|
Loading…
Reference in New Issue
Block a user