mirror of
https://github.com/BeamMP/BeamMP-Server.git
synced 2026-06-18 06:30:53 +00:00
Switched to msvc 2019
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 3.18)
|
||||||
project(Server)
|
project(Server)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#ifdef __linux
|
#ifdef __linux
|
||||||
#define EXCEPTION_POINTERS void
|
#define EXCEPTION_POINTERS void
|
||||||
|
#else
|
||||||
|
#include <WS2tcpip.h>
|
||||||
#endif
|
#endif
|
||||||
#include <string>
|
#include <string>
|
||||||
int Handle(void* ep, char* Origin);
|
int Handle(EXCEPTION_POINTERS* ep, char* Origin);
|
||||||
|
|||||||
@@ -30,7 +30,6 @@ inline void CloseSocketProper(int socket) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#else // win32
|
#else // win32
|
||||||
|
|
||||||
inline void CloseSocketProper(uint64_t socket) {
|
inline void CloseSocketProper(uint64_t socket) {
|
||||||
shutdown(socket, SD_BOTH);
|
shutdown(socket, SD_BOTH);
|
||||||
closesocket(socket);
|
closesocket(socket);
|
||||||
|
|||||||
+1
-2
@@ -7,10 +7,9 @@
|
|||||||
///
|
///
|
||||||
#include "Security/Enc.h"
|
#include "Security/Enc.h"
|
||||||
#include "CustomAssert.h"
|
#include "CustomAssert.h"
|
||||||
|
#include <WS2tcpip.h>
|
||||||
#include "Logger.h"
|
#include "Logger.h"
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
#include <thread>
|
|
||||||
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
int Handle(EXCEPTION_POINTERS* ep, char* Origin) {
|
int Handle(EXCEPTION_POINTERS* ep, char* Origin) {
|
||||||
|
|||||||
Reference in New Issue
Block a user