Merge branch 'develop' into review/flecs-400-update

MafiaHub · Dec 29, 2024 · de96a09 · de96a09
2 parents 3cc0d9e + e76fb37
commit de96a09
Show file tree

Hide file tree

Showing 15 changed files with 1,311 additions and 12 deletions.
diff --git a/.github/workflows/check_style.yml b/.github/workflows/check_style.yml
@@ -1,10 +1,10 @@
 name: Check code style
 
 on:
-  push:
-    branches: [ develop ]
-  pull_request:
-    branches: [ develop ]
+  # push:
+  #   branches: [ develop ]
+  # pull_request:
+  #   branches: [ develop ]
   workflow_dispatch:
 
 jobs:

diff --git a/code/framework/CMakeLists.txt b/code/framework/CMakeLists.txt
@@ -62,6 +62,12 @@ set(FRAMEWORK_CLIENT_SRC
 
     src/integrations/client/instance.cpp
     src/integrations/client/networking/engine.cpp
+
+    src/gui/manager.cpp
+    src/gui/clipboard.cpp
+    src/gui/view.cpp
+    src/gui/sdk.cpp
+    src/gui/backend/view_d3d11.cpp
 )
 
 # Append the platform-dependent files to the related lists
@@ -157,7 +163,7 @@ if(WIN32)
     target_link_directories(Framework PUBLIC ${CMAKE_SOURCE_DIR}/vendors/openssl/lib)
     target_link_libraries(Framework ws2_32 dbghelp crypt32 winmm iphlpapi psapi userenv)
 
-    target_link_libraries(FrameworkClient DiscordSDK DearImGUI UltralightSDK)
+    target_link_libraries(FrameworkClient DiscordSDK DearImGUI)
 
     set(CLIENT_SHARED_LIBS minhook SteamSDK udis86)
     target_link_libraries(FrameworkClient ${CLIENT_SHARED_LIBS} ${FREETYPE_LIBRARY})
@@ -170,7 +176,7 @@ if(WIN32)
     if(NOT CMAKE_CL_64)
         target_link_options(FrameworkServer PUBLIC "-SAFESEH:NO")
     else()
-        target_link_libraries(FrameworkClient)
+        target_link_libraries(FrameworkClient UltralightSDK JavaScriptCorePP)
         target_link_options(FrameworkClient PUBLIC "-SAFESEH:NO")
     endif()
 endif()
diff --git a/code/framework/src/external/discord/wrapper.cpp b/code/framework/src/external/discord/wrapper.cpp
@@ -5,6 +5,7 @@
  * This file comes from MafiaHub, hosted at https://github.com/MafiaHub/Framework.
  * See LICENSE file in the source repository for information regarding licensing.
  */
+
 #include "wrapper.h"
 
 #include <logging/logger.h>

diff --git a/code/framework/src/graphics/renderer.h b/code/framework/src/graphics/renderer.h
@@ -85,5 +85,9 @@ namespace Framework::Graphics {
         bool IsInitialized() const {
             return _initialized;
         }
+
+        RendererBackend GetBackendType() const {
+            return _backend;
+        }
     };
 } // namespace Framework::Graphics