Merge branch 'windows-clang' of https://github.com/DarkflameUniverse/DarkflameServer into windows-clang

re-add testPresets
Merge branch 'main' into windows-clang
2025-12-20 11:59:40 -06:00 · 2024-12-08 20:50:25 +00:00 · 2024-12-08 20:48:36 +00:00 · 2024-12-08 20:40:40 +00:00 · 2024-12-08 20:31:27 +00:00 · 2024-12-08 00:36:49 -06:00
7 changed files with 235 additions and 670 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,8 @@ CMakeFiles/TargetDirectories.txt
 *.sln
 *.recipe

+CMakeUserPresets.json
+
 # clangd
 .cache
 thirdparty/zlib-1.2.11/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,6 +19,9 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON) 	# Export the compile commands for debuggi
 set(CMAKE_POLICY_DEFAULT_CMP0063 NEW) 	# Set CMAKE visibility policy to NEW on project and subprojects
 set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) # Set C and C++ symbol visibility to hide inlined functions
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+  
+set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Choose the type of build, options are: Debug, Release, RelWithDebInfo, MinSizeRel")
+set(DLU_CONFIG_DIR ${CMAKE_SOURCE_DIR}/build CACHE PATH "The directory where the server configuration files are stored")

 # Read variables from file
 FILE(READ "${CMAKE_SOURCE_DIR}/CMakeVariables.txt" variables)
@@ -71,7 +74,7 @@ if(UNIX)

 	# For all except Clang and Apple Clang
 	if(NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-		add_compile_options("-static-libgcc" "-lstdc++fs")
+		add_compile_options("-static-libgcc" "-lstdc++fs" "-Wno-error=implicit-function-declaration" "-Wno-error=int-conversion")
 	endif()

 	if(${DYNAMIC} AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -89,10 +92,11 @@ elseif(WIN32)
 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()

-# Our output dir
-#set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON) # unfortunately, forces all libraries to be built in series, which will slow down the build process
+# Set the output directories
+# ./build/<platform + architecture (x64, x86, aarch64)>/<compiler>/<build_mode>/
+
+set(CMAKE_BINARY_DIR ${CMAKE_BINARY_DIR}/${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}/${CMAKE_CXX_COMPILER_ID}/${CMAKE_BUILD_TYPE})

-# TODO make this not have to override the build type directories
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR})
@@ -107,6 +111,15 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})

+# Get DLU config directory
+if(DEFINED ENV{DLU_CONFIG_DIR})
+	set(DLU_CONFIG_DIR $ENV{DLU_CONFIG_DIR})
+else()
+	set(DLU_CONFIG_DIR ${CMAKE_BINARY_DIR})
+endif()
+
+message(STATUS "Configuration Directory is ${DLU_CONFIG_DIR}, and the build directory is ${CMAKE_BINARY_DIR}")
+
 find_package(MariaDB)

 # Create a /resServer directory
@@ -115,18 +128,11 @@ make_directory(${CMAKE_BINARY_DIR}/resServer)
 # Create a /logs directory
 make_directory(${CMAKE_BINARY_DIR}/logs)

-# Get DLU config directory
-if(DEFINED ENV{DLU_CONFIG_DIR})
-	set(DLU_CONFIG_DIR $ENV{DLU_CONFIG_DIR})
-else()
-	set(DLU_CONFIG_DIR ${PROJECT_BINARY_DIR})
-endif()
-message(STATUS "Variable: DLU_CONFIG_DIR = ${DLU_CONFIG_DIR}")
-
 # Copy resource files on first build
 set(RESOURCE_FILES "sharedconfig.ini" "authconfig.ini" "chatconfig.ini" "worldconfig.ini" "masterconfig.ini" "blocklist.dcf")
 message(STATUS "Checking resource file integrity")

+
 include(Utils)
 UpdateConfigOption(${DLU_CONFIG_DIR}/authconfig.ini "port" "auth_server_port")
 UpdateConfigOption(${DLU_CONFIG_DIR}/chatconfig.ini "port" "chat_server_port")
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -1,641 +1,191 @@
 {
-	"version": 6,
-	"cmakeMinimumRequired": {
-		"major": 3,
-		"minor": 25,
-		"patch": 0
-	},
-	"configurePresets": [
-		{
-			"name": "default",
-			"displayName": "Default configure step",
-			"description": "Use 'build' dir and Unix makefiles",
-			"binaryDir": "${sourceDir}/build",
-			"environment": {
-				"DLU_CONFIG_DIR": "${sourceDir}/build"
-			},
-			"generator": "Unix Makefiles"
-		},
-		{
-			"name": "debug-config",
-			"hidden": true,
-			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Debug"
-			}
-		},
-		{
-			"name": "relwithdebinfo-config",
-			"hidden": true,
-			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "RelWithDebInfo"
-			}
-		},
-		{
-			"name": "release-config",
-			"hidden": true,
-			"cacheVariables": {
-				"CMAKE_BUILD_TYPE": "Release"
-			}
-		},
-		{
-			"name": "clang-config",
-			"hidden": true,
-			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake"
-		},
-		{
-			"name": "gnu-config",
-			"hidden": true,
-			"toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake"
-		},
-		{
-			"name": "windows-msvc",
-			"inherits": "default",
-			"displayName": "[Multi] Windows (MSVC)",
-			"description": "Set architecture to 64-bit (b/c RakNet)",
-			"generator": "Visual Studio 17 2022",
-			"binaryDir": "${sourceDir}/build/msvc",
-			"architecture": {
-				"value": "x64"
-			},
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Windows"
-			}
-		},
-		{
-			"name": "windows-default",
-			"inherits": "windows-msvc",
-			"displayName": "Windows only Configure Settings",
-			"description": "Sets build and install directories",
-			"generator": "Ninja",
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Windows"
-			},
-			"architecture": {
-				"value": "x64"
-			}
-		},
-		{
-			"name": "linux-config",
-			"inherits": "default",
-			"hidden": true,
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Linux"
-			}
-		},
-		{
-			"name": "linux-clang-debug",
-			"inherits": [
-				"linux-config",
-				"clang-config",
-				"debug-config"
-			],
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "Create a debug build using the Clang toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/clang-debug"
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"inherits": [
-				"linux-config",
-				"clang-config",
-				"relwithdebinfo-config"
-			],
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "Create a release build with debug info using the Clang toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/clang-relwithdebinfo"
-		},
-		{
-			"name": "linux-clang-release",
-			"inherits": [
-				"linux-config",
-				"clang-config",
-				"release-config"
-			],
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "Create a release build using the Clang toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/clang-release"
-		},
-		{
-			"name": "linux-gnu-debug",
-			"inherits": [
-				"linux-config",
-				"gnu-config",
-				"debug-config"
-			],
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "Create a debug build using the GNU toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/gnu-debug"
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"inherits": [
-				"linux-config",
-				"gnu-config",
-				"relwithdebinfo-config"
-			],
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "Create a release build with debug info using the GNU toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/gnu-relwithdebinfo"
-		},
-		{
-			"name": "linux-gnu-release",
-			"inherits": [
-				"linux-config",
-				"gnu-config",
-				"release-config"
-			],
-			"displayName": "[Release] Linux (GNU)",
-			"description": "Create a release build using the GNU toolchain for Linux",
-			"binaryDir": "${sourceDir}/build/gnu-release"
-		},
-		{
-			"name": "macos",
-			"inherits": "default",
-			"displayName": "[Multi] MacOS",
-			"description": "Create a build for MacOS",
-			"condition": {
-				"type": "equals",
-				"lhs": "${hostSystemName}",
-				"rhs": "Darwin"
-			},
-			"binaryDir": "${sourceDir}/build/macos"
-		}
-	],
-	"buildPresets": [
-		{
-			"name": "default",
-			"configurePreset": "default",
-			"displayName": "Default Build",
-			"description": "Default Build",
-			"jobs": 2
-		},
-		{
-			"name": "windows-msvc-debug",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Debug] Windows (MSVC)",
-			"description": "This preset is used to build in debug mode using the MSVC toolchain on Windows",
-			"configuration": "Debug"
-		},
-		{
-			"name": "windows-msvc-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"displayName": "[RelWithDebInfo] Windows (MSVC)",
-			"description": "This preset is used to build in debug mode using the MSVC toolchain on Windows",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "windows-msvc-release",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Release] Windows (MSVC)",
-			"description": "This preset is used to build in release mode using the MSVC toolchain on Windows",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-clang-debug",
-			"inherits": "default",
-			"configurePreset": "linux-clang-debug",
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "This preset is used to build in debug mode using the Clang toolchain on Linux",
-			"configuration": "Debug"
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-clang-relwithdebinfo",
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "This preset is used to build in release mode with debug info using the Clang toolchain on Linux",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-clang-release",
-			"inherits": "default",
-			"configurePreset": "linux-clang-release",
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "This preset is used to build in release mode using the Clang toolchain on Linux",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-gnu-debug",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-debug",
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "This preset is used to build in debug mode using the GNU toolchain on Linux",
-			"configuration": "Debug"
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "This preset is used to build in release mode with debug info using the GNU toolchain on Linux",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-gnu-release",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-release",
-			"displayName": "[Release] Linux (GNU)",
-			"description": "This preset is used to build in release mode using the GNU toolchain on Linux",
-			"configuration": "Release"
-		},
-		{
-			"name": "macos-debug",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Debug] MacOS",
-			"description": "This preset is used to build in debug mode on MacOS",
-			"configuration": "Debug"
-		},
-		{
-			"name": "macos-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[RelWithDebInfo] MacOS",
-			"description": "This preset is used to build in release mode with debug info on MacOS",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "macos-release",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Release] MacOS",
-			"description": "This preset is used to build in release mode on MacOS",
-			"configuration": "Release"
-		}
-	],
-	"testPresets": [
-		{
-			"name": "default",
-			"configurePreset": "default",
-			"execution": {
-				"jobs": 2
-			},
-			"output": {
-				"outputOnFailure": true
-			}
-		},
-		{
-			"name": "windows-msvc-test",
-			"inherits": "default",
-			"configurePreset": "windows-msvc",
-			"hidden": true,
-			"filter": {
-				"exclude": {
-					"name": "((example)|(minigzip))+"
-				}
-			}
-		},
-		{
-			"name": "windows-msvc-debug",
-			"inherits": "windows-msvc-test",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Debug] Windows (MSVC)",
-			"description": "Runs all tests on a Windows configuration",
-			"configuration": "Debug"
-		},
-		{
-			"name": "windows-msvc-relwithdebinfo",
-			"inherits": "windows-msvc-test",
-			"configurePreset": "windows-msvc",
-			"displayName": "[RelWithDebInfo] Windows (MSVC)",
-			"description": "Runs all tests on a Windows configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "windows-msvc-release",
-			"inherits": "windows-msvc-test",
-			"configurePreset": "windows-msvc",
-			"displayName": "[Release] Windows (MSVC)",
-			"description": "Runs all tests on a Windows configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-clang-debug",
-			"inherits": "default",
-			"configurePreset": "linux-clang-debug",
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "Runs all tests on a Linux Clang configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-clang-relwithdebinfo",
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "Runs all tests on a Linux Clang configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-clang-release",
-			"inherits": "default",
-			"configurePreset": "linux-clang-release",
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "Runs all tests on a Linux Clang configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-gnu-debug",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-debug",
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "Runs all tests on a Linux GNU configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "Runs all tests on a Linux GNU configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "linux-gnu-release",
-			"inherits": "default",
-			"configurePreset": "linux-gnu-release",
-			"displayName": "[Release] Linux (GNU)",
-			"description": "Runs all tests on a Linux GNU configuration",
-			"configuration": "Release"
-		},
-		{
-			"name": "macos-debug",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Debug] MacOS",
-			"description": "Runs all tests on a MacOS configuration",
-			"configuration": "Debug"
-		},
-		{
-			"name": "macos-relwithdebinfo",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[RelWithDebInfo] MacOS",
-			"description": "Runs all tests on a MacOS configuration",
-			"configuration": "RelWithDebInfo"
-		},
-		{
-			"name": "macos-release",
-			"inherits": "default",
-			"configurePreset": "macos",
-			"displayName": "[Release] MacOS",
-			"description": "Runs all tests on a MacOS configuration",
-			"configuration": "Release"
-		}
-	],
-	"workflowPresets": [
-		{
-			"name": "default",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "default"
-				},
-				{
-					"type": "build",
-					"name": "default"
-				},
-				{
-					"type": "test",
-					"name": "default"
-				}
-			]
-		},
-		{
-			"name": "windows-msvc-debug",
-			"displayName": "[Debug] Windows (MSVC)",
-			"description": "MSVC debug workflow preset for Windows",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "windows-msvc"
-				},
-				{
-					"type": "build",
-					"name": "windows-msvc-debug"
-				},
-				{
-					"type": "test",
-					"name": "windows-msvc-debug"
-				}
-			]
-		},
-		{
-			"name": "windows-msvc-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Windows (MSVC)",
-			"description": "MSVC release with debug info workflow preset for Windows",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "windows-msvc"
-				},
-				{
-					"type": "build",
-					"name": "windows-msvc-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "windows-msvc-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "ci-windows-2022",
-			"displayName": "[Release] Windows (MSVC)",
-			"description": "CI workflow preset for Windows",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "windows-msvc"
-				},
-				{
-					"type": "build",
-					"name": "windows-msvc-release"
-				},
-				{
-					"type": "test",
-					"name": "windows-msvc-release"
-				}
-			]
-		},
-		{
-			"name": "linux-gnu-debug",
-			"displayName": "[Debug] Linux (GNU)",
-			"description": "GNU debug workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-gnu-debug"
-				},
-				{
-					"type": "build",
-					"name": "linux-gnu-debug"
-				},
-				{
-					"type": "test",
-					"name": "linux-gnu-debug"
-				}
-			]
-		},
-		{
-			"name": "linux-gnu-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] Linux (GNU)",
-			"description": "GNU release with debug info workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-gnu-relwithdebinfo"
-				},
-				{
-					"type": "build",
-					"name": "linux-gnu-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "linux-gnu-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "ci-ubuntu-22.04",
-			"displayName": "[Release] Linux (GNU)",
-			"description": "CI workflow preset for Ubuntu",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-gnu-release"
-				},
-				{
-					"type": "build",
-					"name": "linux-gnu-release"
-				},
-				{
-					"type": "test",
-					"name": "linux-gnu-release"
-				}
-			]
-		},
-		{
-			"name": "linux-clang-debug",
-			"displayName": "EXPERIMENTAL - [Debug] Linux (Clang)",
-			"description": "Clang debug workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-clang-debug"
-				},
-				{
-					"type": "build",
-					"name": "linux-clang-debug"
-				},
-				{
-					"type": "test",
-					"name": "linux-clang-debug"
-				}
-			]
-		},
-		{
-			"name": "linux-clang-relwithdebinfo",
-			"displayName": "EXPERIMENTAL - [RelWithDebInfo] Linux (Clang)",
-			"description": "Clang release with debug info workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-clang-relwithdebinfo"
-				},
-				{
-					"type": "build",
-					"name": "linux-clang-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "linux-clang-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "linux-clang-release",
-			"displayName": "EXPERIMENTAL - [Release] Linux (Clang)",
-			"description": "Clang release workflow preset for Linux",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "linux-clang-release"
-				},
-				{
-					"type": "build",
-					"name": "linux-clang-release"
-				},
-				{
-					"type": "test",
-					"name": "linux-clang-release"
-				}
-			]
-		},
-		{
-			"name": "macos-debug",
-			"displayName": "[Debug] MacOS",
-			"description": "Release workflow preset for MacOS",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "macos"
-				},
-				{
-					"type": "build",
-					"name": "macos-debug"
-				},
-				{
-					"type": "test",
-					"name": "macos-debug"
-				}
-			]
-		},
-		{
-			"name": "macos-relwithdebinfo",
-			"displayName": "[RelWithDebInfo] MacOS",
-			"description": "Release with debug info workflow preset for MacOS",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "macos"
-				},
-				{
-					"type": "build",
-					"name": "macos-relwithdebinfo"
-				},
-				{
-					"type": "test",
-					"name": "macos-relwithdebinfo"
-				}
-			]
-		},
-		{
-			"name": "ci-macos-13",
-			"displayName": "[Release] MacOS",
-			"description": "CI workflow preset for MacOS",
-			"steps": [
-				{
-					"type": "configure",
-					"name": "macos"
-				},
-				{
-					"type": "build",
-					"name": "macos-release"
-				},
-				{
-					"type": "test",
-					"name": "macos-release"
-				}
-			]
-		}
-	]
-}
+    "version": 6,
+    "cmakeMinimumRequired": {
+        "major": 3,
+        "minor": 25,
+        "patch": 0
+    },
+    "configurePresets": [
+        {
+            "name": "default",
+            "displayName": "Default configure step",
+            "description": "Use 'build' dir and Unix makefiles",
+            "binaryDir": "${sourceDir}/build",
+            "generator": "Unix Makefiles",
+            "hidden": true
+        },
+        {
+            "name": "windows-default",
+            "inherits": "default",
+            "displayName": "Windows Default Configure Settings",
+            "description": "Sets build and install directories",
+            "generator": "Visual Studio 17 2022",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Windows"
+            },
+            "hidden": true
+        },
+        {
+            "name": "windows-msvc",
+            "inherits": "windows-default",
+            "displayName": "Windows (MSVC)",
+            "description": "Create a build using MSVC"
+        },
+        {
+            "name": "windows-clang",
+            "inherits": "windows-default",
+            "displayName": "EXPERIMENTAL - Windows (Clang)",
+            "description": "Create a build using Clang",
+            "toolset": "ClangCL"
+        },
+        {
+            "name": "linux-default",
+            "inherits": "default",
+            "hidden": true,
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            }
+        },
+        {
+            "name": "linux-clang",
+            "inherits": "linux-default",
+            "toolchainFile": "${sourceDir}/cmake/toolchains/linux-clang.cmake",
+            "displayName": "Linux (Clang)",
+            "description": "Create a build using the Clang toolchain for Linux"
+        },
+        {
+            "name": "linux-gnu",
+            "inherits": "linux-default",
+            "toolchainFile": "${sourceDir}/cmake/toolchains/linux-gnu.cmake",
+            "displayName": "Linux (GNU)",
+            "description": "Create a build using the GNU toolchain for Linux"
+        },
+        {
+            "name": "macos",
+            "inherits": "default",
+            "displayName": "MacOS",
+            "description": "Create a build for MacOS",
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Darwin"
+            }
+        }
+    ],
+    "buildPresets": [
+        {
+            "name": "default",
+            "configurePreset": "default",
+            "displayName": "Default Build",
+            "description": "Default Build",
+            "jobs": 2
+        }
+    ],
+    "testPresets": [
+        {
+            "name": "ci-ubuntu-22.04",
+            "configurePreset": "ci-ubuntu-22.04",
+            "displayName": "CI Tests on Linux",
+            "description": "Runs all tests on a linux configuration",
+            "execution": {
+                "jobs": 2
+            },
+            "output": {
+                "outputOnFailure": true
+            }
+        },
+        {
+            "name": "ci-macos-13",
+            "configurePreset": "ci-macos-13",
+            "displayName": "CI Tests on MacOS",
+            "description": "Runs all tests on a Mac configuration",
+            "execution": {
+                "jobs": 2
+            },
+            "output": {
+                "outputOnFailure": true
+            }
+        },
+        {
+            "name": "ci-windows-2022",
+            "configurePreset": "ci-windows-2022",
+            "displayName": "CI Tests on windows",
+            "description": "Runs all tests on a windows configuration",
+            "configuration": "RelWithDebInfo",
+            "execution": {
+                "jobs": 2
+            },
+            "output": {
+                "outputOnFailure": true
+            },
+            "filter": {
+                "exclude": {
+                    "name": "((example)|(minigzip))+"
+                }
+            }
+        }
+    ],
+    "workflowPresets": [
+        {
+            "name": "ci-windows-2022",
+            "displayName": "[Release] Windows (MSVC)",
+            "description": "CI workflow preset for Windows",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "windows-msvc"
+                },
+                {
+                    "type": "build",
+                    "name": "default"
+                },
+                {
+                    "type": "test",
+                    "name": "default"
+                }
+            ]
+        },
+        {
+            "name": "ci-ubuntu-22.04",
+            "displayName": "[Release] Linux (GNU)",
+            "description": "CI workflow preset for Ubuntu",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "linux-gnu"
+                },
+                {
+                    "type": "build",
+                    "name": "default"
+                },
+                {
+                    "type": "test",
+                    "name": "ci-ubuntu-22.04"
+                }
+            ]
+        },
+        {
+            "name": "ci-macos-13",
+            "displayName": "[Release] MacOS",
+            "description": "CI workflow preset for MacOS",
+            "steps": [
+                {
+                    "type": "configure",
+                    "name": "macos"
+                },
+                {
+                    "type": "build",
+                    "name": "default"
+                },
+                {
+                    "type": "test",
+                    "name": "default"
+                }
+            ]
+        }
+    ]
+}
--- a/dCommon/CMakeLists.txt
+++ b/dCommon/CMakeLists.txt
@@ -45,11 +45,14 @@ if (UNIX)
 elseif (WIN32)
 	include(FetchContent)

+    set(WITH_GTEST OFF CACHE BOOL "" FORCE)
+    set(ZLIB_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
+
 	# TODO Keep an eye on the zlib repository for an update to disable testing.  Don't forget to update CMakePresets
 	FetchContent_Declare(
 		zlib
-		URL https://github.com/madler/zlib/archive/refs/tags/v1.2.11.zip
-		URL_HASH MD5=9d6a627693163bbbf3f26403a3a0b0b1
+		URL https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.2.2.zip
+		URL_HASH MD5=2cf9199fb785ea579a2a9905a75c38b3
 	)

 	# Disable warning about no project version.
@@ -60,7 +63,6 @@ elseif (WIN32)
 	FetchContent_MakeAvailable(zlib)

 	set(ZLIB_INCLUDE_DIRS ${zlib_SOURCE_DIR} ${zlib_BINARY_DIR})
-	set_target_properties(zlib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${ZLIB_INCLUDE_DIRS}")
 	add_library(ZLIB::ZLIB ALIAS zlib)
 else ()
 	message(
--- a/dCommon/ZCompression.cpp
+++ b/dCommon/ZCompression.cpp
@@ -1,6 +1,6 @@
 #include "ZCompression.h"

-#include "zlib.h"
+#include "zlib-ng.h"

 namespace ZCompression {
 	int32_t GetMaxCompressedLength(int32_t nLenSrc) {
@@ -9,41 +9,41 @@ namespace ZCompression {
 	}

 	int32_t Compress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst) {
-		z_stream zInfo = { 0 };
+		zng_stream zInfo = { 0 };
 		zInfo.total_in = zInfo.avail_in = nLenSrc;
 		zInfo.total_out = zInfo.avail_out = nLenDst;
 		zInfo.next_in = const_cast<Bytef*>(abSrc);
 		zInfo.next_out = abDst;

 		int nErr, nRet = -1;
-		nErr = deflateInit(&zInfo, Z_DEFAULT_COMPRESSION); // zlib function
+		nErr = zng_deflateInit(&zInfo, Z_DEFAULT_COMPRESSION); // zlib function
 		if (nErr == Z_OK) {
-			nErr = deflate(&zInfo, Z_FINISH);              // zlib function
+			nErr = zng_deflate(&zInfo, Z_FINISH);              // zlib function
 			if (nErr == Z_STREAM_END) {
 				nRet = zInfo.total_out;
 			}
 		}
-		deflateEnd(&zInfo);    // zlib function
+		zng_deflateEnd(&zInfo);    // zlib function
 		return(nRet);
 	}

 	int32_t Decompress(const uint8_t* abSrc, int32_t nLenSrc, uint8_t* abDst, int32_t nLenDst, int32_t& nErr) {
 		// Get the size of the decompressed data
-		z_stream zInfo = { 0 };
+		zng_stream zInfo = { 0 };
 		zInfo.total_in = zInfo.avail_in = nLenSrc;
 		zInfo.total_out = zInfo.avail_out = nLenDst;
 		zInfo.next_in = const_cast<Bytef*>(abSrc);
 		zInfo.next_out = abDst;

 		int nRet = -1;
-		nErr = inflateInit(&zInfo); // zlib function
+		nErr = zng_inflateInit(&zInfo); // zlib function
 		if (nErr == Z_OK) {
-			nErr = inflate(&zInfo, Z_FINISH); // zlib function
+			nErr = zng_inflate(&zInfo, Z_FINISH); // zlib function
 			if (nErr == Z_STREAM_END) {
 				nRet = zInfo.total_out;
 			}
 		}
-		inflateEnd(&zInfo); // zlib function
+		zng_inflateEnd(&zInfo); // zlib function
 		return(nRet);
 	}
 }
--- a/dCommon/dClient/AssetManager.cpp
+++ b/dCommon/dClient/AssetManager.cpp
@@ -4,8 +4,6 @@
 #include "Game.h"
 #include "Logger.h"

-#include "zlib.h"
-
 AssetManager::AssetManager(const std::filesystem::path& path) {
 	if (!std::filesystem::is_directory(path)) {
 		throw std::runtime_error("Attempted to load asset bundle (" + path.string() + ") however it is not a valid directory.");
@@ -82,7 +80,7 @@ bool AssetManager::HasFile(const char* name) {
 	if (fixedName.rfind("client\\res\\", 0) != 0) fixedName = "client\\res\\" + fixedName;

 	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+	crc = crc32b(crc, reinterpret_cast<uint8_t*>(const_cast<char*>("\0\0\0\0")), 4);

 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
@@ -130,7 +128,7 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 	}
 	int32_t packIndex = -1;
 	uint32_t crc = crc32b(0xFFFFFFFF, reinterpret_cast<uint8_t*>(const_cast<char*>(fixedName.c_str())), fixedName.size());
-	crc = crc32b(crc, reinterpret_cast<Bytef*>(const_cast<char*>("\0\0\0\0")), 4);
+	crc = crc32b(crc, reinterpret_cast<uint8_t*>(const_cast<char*>("\0\0\0\0")), 4);

 	for (const auto& item : this->m_PackIndex->GetPackFileIndices()) {
 		if (item.m_Crc == crc) {
--- a/dNet/AuthPackets.cpp
+++ b/dNet/AuthPackets.cpp
@@ -87,6 +87,13 @@ void AuthPackets::SendHandshake(dServer* server, const SystemAddress& sysAddr, c
 	server->Send(bitStream, sysAddr, false);
 }

+std::string CleanReceivedString(const std::string& str) {
+	std::string toReturn = str;
+	const auto removed = std::ranges::find_if(toReturn, [](char c) { return isprint(c) == 0 && isblank(c) == 0; });
+	toReturn.erase(removed, toReturn.end());
+	return toReturn;
+}
+
 void AuthPackets::HandleLoginRequest(dServer* server, Packet* packet) {
 	CINSTREAM_SKIP_HEADER;

@@ -111,11 +118,11 @@ void AuthPackets::HandleLoginRequest(dServer* server, Packet* packet) {

 	LUWString memoryStats(256);
 	inStream.Read(memoryStats);
-	LOG_DEBUG("Memory Stats [%s]", memoryStats.GetAsString().c_str());
+	LOG_DEBUG("Memory Stats [%s]", CleanReceivedString(memoryStats.GetAsString()).c_str());

 	LUWString videoCard(128);
 	inStream.Read(videoCard);
-	LOG_DEBUG("VideoCard Info: [%s]", videoCard.GetAsString().c_str());
+	LOG_DEBUG("VideoCard Info: [%s]", CleanReceivedString(videoCard.GetAsString()).c_str());

 	// Processor/CPU info
 	uint32_t numOfProcessors;
Author	SHA1	Message	Date
Jettford	eb1137f664	Merge branch 'windows-clang' of https://github.com/DarkflameUniverse/DarkflameServer into windows-clang	2024-12-08 20:50:25 +00:00
Jettford	10e64a5d20	re-add testPresets	2024-12-08 20:48:36 +00:00
Jett	9d52c0fb84	Merge branch 'main' into windows-clang	2024-12-08 20:40:40 +00:00
Jettford	83e08f63bc	remove test and workflow presets	2024-12-08 20:31:27 +00:00
David Markowitz	8b56b0b7ba	fix: use current binary directory mariadb shared object and dont override env variable (#1669 ) * mac stuff grab correct mariadb file and dont override env variable fix for unix Update CMakeLists.txt unix only * get that dylib	2024-12-08 00:36:49 -06:00
David Markowitz	4a1c289fb1	fix: avant gardens switches (#1667 ) * yep * remove dumb knockback idk how the 1 switch in pet cove does it	2024-12-07 19:11:13 -06:00
David Markowitz	32a1e5ece5	update sqlite (#1665 )	2024-12-06 15:04:23 -06:00
David Markowitz	7fcbb9507b	feat: re-write leaderboards again and fully remove mysql dependency outside of database (#1662 ) * simplify leaderboard code, fully abstract database * update exception catching * update exception catching and sql references, remove ugc from gamemessages fix deleting model remove unrelated changes Update GameMessages.cpp * remove ugc from gamemessages * Update GameMessages.cpp * Update Leaderboard.cpp * bug fixes * fix racing leaderboard * remove extra stuff * update	2024-12-06 05:03:47 -06:00
David Markowitz	730533c690	fix: abstract ugc rockets and cars from GameMessages (#1660 ) * update exception catching and sql references, remove ugc from gamemessages fix deleting model remove unrelated changes Update GameMessages.cpp * remove ugc from gamemessages	2024-12-05 20:00:54 -08:00
Jettford	ece0e29577	I made this mistake years ago, my bad	2024-12-05 20:03:17 +00:00
Jettford	6eea3f3662	Fix up ZLib a little more and remove more configuration into CMakeLists	2024-12-05 19:45:21 +00:00
Jettford	6c8bb743af	Remove user-specific clang configurations Also replace zlib with zlib-ng	2024-12-04 22:38:05 +00:00
David Markowitz	129d9fd0b9	update exception catching (#1661 )	2024-12-04 03:30:14 -06:00
jadebenn	f4082cc538	formatting	2024-12-03 21:18:31 -06:00
jadebenn	edc7109e19	update presets	2024-12-03 21:14:24 -06:00
jadebenn	da45152b43	clang cl toolset	2024-12-03 20:41:23 -06:00
jadebenn	8b9a0768a2	trying to enable clang for windows msvc	2024-12-03 20:30:09 -06:00
David Markowitz	ec4ec2133b	fix: logging uninitialized memory (#1658 ) fixes an issue where the console would halt because we printed a control code which did such	2024-12-03 15:01:43 -06:00