the last recode

CMakeLists.txt

@@ -1,14 +1,13 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.28)
 project(selaura LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(CLIENT_VERSION "0.30")
+set(CLIENT_VERSION "0.40")
 
 if (WIN32)
-
     add_compile_definitions(SELAURA_WINDOWS)
     set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL")
 
@@ -23,33 +22,36 @@ if (WIN32)
     endif ()
 
     add_compile_options(/await)
-
-elseif (ANDROID)
-
-    add_compile_definitions(SELAURA_ANDROID)
-    message(STATUS "Selaura: Building for Android (${CMAKE_SYSTEM_NAME} - ${CMAKE_SYSTEM_PROCESSOR})")
-    if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-        message(FATAL_ERROR "Selaura: Clang is required for Android.")
-    endif ()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++" CACHE STRING "" FORCE)
-
 elseif (UNIX)
-
     add_compile_definitions(SELAURA_LINUX)
     if (NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         message(FATAL_ERROR "Selaura: Clang is required on Linux.")
     endif ()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -fPIC" CACHE STRING "" FORCE)
-
 else()
     message(FATAL_ERROR "Selaura: ${CMAKE_SYSTEM_NAME} (${CMAKE_SYSTEM_PROCESSOR}) is not supported")
 endif ()
 
+if (MSVC AND CMAKE_BUILD_TYPE STREQUAL "Debug")
+    set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebugDLL")
+    set(CMAKE_CXX_FLAGS_DEBUG "/MDd /Zi /Od" CACHE STRING "" FORCE)
+
+    add_compile_definitions(
+            _ITERATOR_DEBUG_LEVEL=0
+            _HAS_ITERATOR_DEBUGGING=0
+            _SECURE_SCL=0
+    )
+endif()
+
 add_compile_definitions(
         CLIENT_VERSION=\"${CLIENT_VERSION}\"
 )
 
 add_subdirectory(include)
-add_subdirectory(src/bedrock)
 add_subdirectory(src/client)
-add_subdirectory(src/src-native-plugin)
+
+if (MSVC)
+    add_compile_options(/W4 /permissive- /wd4201 /wd4324)
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
+    add_compile_options(-Wall -Wextra -Wpedantic -Wno-gnu-zero-variadic-macro-arguments)
+endif ()

include/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.28)
 project(selaura LANGUAGES CXX)
 
 if(NOT CPM_SOURCE_CACHE)
@@ -49,22 +49,11 @@ CPMAddPackage(
         GIT_TAG master
 )
 
-if(MSVC)
-    CPMAddPackage(
-            NAME minhook
-            GITHUB_REPOSITORY TsudaKageyu/minhook
-            GIT_TAG master
-    )
-else()
-    CPMAddPackage(
-            NAME dobby
-            GITHUB_REPOSITORY selauraclient/Dobby
-            GIT_TAG master
-    )
-endif()
-
-set(DOBBY_DEBUG OFF CACHE BOOL "Dobby debug mode")
-set(DOBBY_GENERATE_SHARED OFF CACHE BOOL "Dobby generate shared library")
+CPMAddPackage(
+        NAME safetyhook
+        GITHUB_REPOSITORY cursey/safetyhook
+        GIT_TAG main
+)
 
 add_library(selaura INTERFACE)
 add_library(selaura::selaura ALIAS selaura)
@@ -73,17 +62,12 @@ target_include_directories(selaura INTERFACE
         ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-if(MSVC)
-    target_link_libraries(selaura INTERFACE minhook)
-else()
-    target_link_libraries(selaura INTERFACE dobby)
-endif()
-
 target_link_libraries(selaura INTERFACE
         fmt
         EnTT::EnTT
         libhat
         spdlog::spdlog
         GSL::gsl
         glm
-)
+        safetyhook::safetyhook
+)