diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | win/inspircd_win32wrapper.h | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 10653cf74..7be08a3fc 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -85,6 +85,7 @@ file(MAKE_DIRECTORY ${LOG_PATH}) install(DIRECTORY ${LOG_PATH} DESTINATION .) if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake") + set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION ".") # place runtime libraries next to InspIRCd binary include(InstallRequiredSystemLibraries) set(CPACK_PACKAGE_NAME "InspIRCd IRC Daemon") diff --git a/win/inspircd_win32wrapper.h b/win/inspircd_win32wrapper.h index be437d4a3..d7ceb73aa 100644 --- a/win/inspircd_win32wrapper.h +++ b/win/inspircd_win32wrapper.h @@ -63,6 +63,7 @@ /* Disable the deprecation warnings.. it spams :P */ #define _CRT_SECURE_NO_DEPRECATE +#define _WINSOCK_DEPRECATED_NO_WARNINGS /* Normal windows (platform-specific) includes */ #include <winsock2.h> @@ -90,9 +91,11 @@ CoreExport const char * insp_inet_ntop(int af, const void * src, char * dst, soc #define inet_pton insp_inet_pton #define inet_ntop insp_inet_ntop -/* Safe printf functions aren't defined in VC++ */ +/* Safe printf functions aren't defined in VC++ releases older than v14 */ +#if _MSC_VER <= 1800 #define snprintf _snprintf #define vsnprintf _vsnprintf +#endif /* Unix-style sleep (argument is in seconds) */ __inline void sleep(int seconds) { Sleep(seconds * 1000); } @@ -136,11 +139,13 @@ struct DIR bool first; }; +#if _MSC_VER <= 1800 struct timespec { time_t tv_sec; long tv_nsec; }; +#endif CoreExport DIR * opendir(const char * path); CoreExport dirent * readdir(DIR * handle); |