Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Ultralight web UI implementation #121

Merged
merged 5 commits into from
Dec 29, 2024
Merged

feat: Ultralight web UI implementation #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccba202
feat: Ultralight web UI implementation
zpl-zak Dec 29, 2024
12ecfcd
chore: attempt to fix style checker CI
zpl-zak Dec 29, 2024
65243ea
chore: bye check_style
zpl-zak Dec 29, 2024
8fc7c1e
fix: ensure ultralight is only used on x64 builds
zpl-zak Dec 29, 2024
c7ef255
Merge branch 'develop' into feature/web-ui
zpl-zak Dec 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/check_style.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 8 additions & 2 deletions code/framework/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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})
Expand All @@ -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()
1 change: 1 addition & 0 deletions code/framework/src/external/discord/wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 4 additions & 0 deletions code/framework/src/graphics/renderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,5 +85,9 @@ namespace Framework::Graphics {
bool IsInitialized() const {
return _initialized;
}

RendererBackend GetBackendType() const {
return _backend;
}
};
} // namespace Framework::Graphics
Loading
Loading