mirror of
https://github.com/DarkflameUniverse/DarkflameServer.git
synced 2024-11-09 17:58:20 +00:00
More windows fixes (#329)
- Added World, Chat and Auth servers as deps to Master - Added "windows-default" CMake preset so that CMake didn't error out on Windows - Added NOMINMAX define above cpplinq include
This commit is contained in:
parent
a15f9f38d8
commit
83107d413d
@ -487,3 +487,9 @@ if(UNIX)
|
|||||||
endif()
|
endif()
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -O2 -fPIC")
|
||||||
endif(UNIX)
|
endif(UNIX)
|
||||||
|
|
||||||
|
if(WIN32)
|
||||||
|
add_dependencies(MasterServer WorldServer)
|
||||||
|
add_dependencies(MasterServer AuthServer)
|
||||||
|
add_dependencies(MasterServer ChatServer)
|
||||||
|
endif()
|
@ -12,6 +12,20 @@
|
|||||||
"description": "Sets build and install directories",
|
"description": "Sets build and install directories",
|
||||||
"binaryDir": "${sourceDir}/build",
|
"binaryDir": "${sourceDir}/build",
|
||||||
"generator": "Unix Makefiles"
|
"generator": "Unix Makefiles"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "windows-default",
|
||||||
|
"displayName": "Windows only Configure Settings",
|
||||||
|
"description": "Sets build and install directories",
|
||||||
|
"binaryDir": "${sourceDir}/build",
|
||||||
|
"generator": "Ninja",
|
||||||
|
"architecture": {
|
||||||
|
"value": "x64",
|
||||||
|
"strategy": "external"
|
||||||
|
},
|
||||||
|
"cacheVariables": {
|
||||||
|
"CMAKE_BUILD_TYPE": "RelWithDebInfo"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"buildPresets": [
|
"buildPresets": [
|
||||||
|
@ -10,6 +10,10 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
|
|
||||||
// CPPLinq
|
// CPPLinq
|
||||||
|
#ifdef _WIN32
|
||||||
|
#define NOMINMAX
|
||||||
|
// windows.h has min and max macros that breaks cpplinq
|
||||||
|
#endif
|
||||||
#include "cpplinq.hpp"
|
#include "cpplinq.hpp"
|
||||||
|
|
||||||
#pragma warning (disable : 4244) //Disable double to float conversion warnings
|
#pragma warning (disable : 4244) //Disable double to float conversion warnings
|
||||||
|
Loading…
Reference in New Issue
Block a user