auto update to latest DPP master branch

brainboxdotcc · Feb 21, 2025 · e39781b · e39781b
1 parent 3d35a5c
commit e39781b
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 20 deletions.
diff --git a/MyBot/dependencies/32/debug/bin/dpp.dll b/MyBot/dependencies/32/debug/bin/dpp.dll
diff --git a/MyBot/dependencies/32/debug/lib/cmake/dpp/dpp-config-version.cmake b/MyBot/dependencies/32/debug/lib/cmake/dpp/dpp-config-version.cmake
@@ -9,19 +9,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "10.1.0")
+set(PACKAGE_VERSION "10.1.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("10.1.0" MATCHES "^([0-9]+)\\.")
+  if("10.1.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "10.1.0")
+    set(CVF_VERSION_MAJOR "10.1.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)

diff --git a/MyBot/dependencies/32/release/bin/dpp.dll b/MyBot/dependencies/32/release/bin/dpp.dll
diff --git a/MyBot/dependencies/32/release/lib/cmake/dpp/dpp-config-version.cmake b/MyBot/dependencies/32/release/lib/cmake/dpp/dpp-config-version.cmake
@@ -9,19 +9,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "10.1.0")
+set(PACKAGE_VERSION "10.1.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("10.1.0" MATCHES "^([0-9]+)\\.")
+  if("10.1.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "10.1.0")
+    set(CVF_VERSION_MAJOR "10.1.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)

diff --git a/MyBot/dependencies/64/debug/bin/dpp.dll b/MyBot/dependencies/64/debug/bin/dpp.dll
diff --git a/MyBot/dependencies/64/debug/lib/cmake/dpp/dpp-config-version.cmake b/MyBot/dependencies/64/debug/lib/cmake/dpp/dpp-config-version.cmake
@@ -9,19 +9,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "10.1.0")
+set(PACKAGE_VERSION "10.1.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("10.1.0" MATCHES "^([0-9]+)\\.")
+  if("10.1.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "10.1.0")
+    set(CVF_VERSION_MAJOR "10.1.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)

diff --git a/MyBot/dependencies/64/release/bin/dpp.dll b/MyBot/dependencies/64/release/bin/dpp.dll
diff --git a/MyBot/dependencies/64/release/lib/cmake/dpp/dpp-config-version.cmake b/MyBot/dependencies/64/release/lib/cmake/dpp/dpp-config-version.cmake
@@ -9,19 +9,19 @@
 # The variable CVF_VERSION must be set before calling configure_file().
 
 
-set(PACKAGE_VERSION "10.1.0")
+set(PACKAGE_VERSION "10.1.1")
 
 if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
   set(PACKAGE_VERSION_COMPATIBLE FALSE)
 else()
 
-  if("10.1.0" MATCHES "^([0-9]+)\\.")
+  if("10.1.1" MATCHES "^([0-9]+)\\.")
     set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
     if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0)
       string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}")
     endif()
   else()
-    set(CVF_VERSION_MAJOR "10.1.0")
+    set(CVF_VERSION_MAJOR "10.1.1")
   endif()
 
   if(PACKAGE_FIND_VERSION_RANGE)

diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/export.h b/MyBot/dependencies/include/dpp-10.1/dpp/export.h
@@ -33,13 +33,15 @@
 	#error "D++ Requires a C++17 compatible C++ compiler. Please ensure that you have enabled C++17 in your compiler flags."
 #endif
 
-/* If not using c++20, define DPP_CPP17_COMPAT and DPP_NO_CORO.
+/* If not using c++20, define DPP_CPP17_COMPAT and DPP_NO_CORO if DPP_NO_CORO is not already defined.
  */
 #if !(defined(__cplusplus) && __cplusplus >= 202002L) && !(defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
-#  define DPP_CPP17_COMPAT
-#  if !defined(DPP_CORO) || !DPP_CORO // Allow overriding this because why not
-#    define DPP_NO_CORO
-#  endif
+	#define DPP_CPP17_COMPAT
+	#if !defined(DPP_CORO) || !DPP_CORO // Allow overriding this because why not
+		#ifndef DPP_NO_CORO
+			#define DPP_NO_CORO
+		#endif
+	#endif
 #endif
 
 #ifndef DPP_STATIC

diff --git a/MyBot/dependencies/include/dpp-10.1/dpp/version.h b/MyBot/dependencies/include/dpp-10.1/dpp/version.h
@@ -22,9 +22,9 @@
 #pragma once
 
 #ifndef DPP_VERSION_LONG
-#define DPP_VERSION_LONG 0x00100100
-#define DPP_VERSION_SHORT 100100
-#define DPP_VERSION_TEXT "D++ 10.1.0 (06-Dec-2024)"
+#define DPP_VERSION_LONG 0x00100101
+#define DPP_VERSION_SHORT 100101
+#define DPP_VERSION_TEXT "D++ 10.1.1 (15-Feb-2025)"
 
 #define DPP_VERSION_MAJOR ((DPP_VERSION_LONG & 0x00ff0000) >> 16)
 #define DPP_VERSION_MINOR ((DPP_VERSION_LONG & 0x0000ff00) >> 8)