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

Compile fix for PS5 platform #36

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Compile fix for PS5 platform #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions Source/ThirdParty/ImGuiLibrary/Private/imgui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15026,6 +15026,10 @@ static void Platform_SetClipboardTextFn_DefaultImpl(ImGuiContext* ctx, const cha
#if defined(_WIN32) && defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
#endif

#if PLATFORM_PS5
#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
#endif
#endif

#ifndef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
Expand Down
6 changes: 6 additions & 0 deletions Source/ThirdParty/ImPlotLibrary/Private/implot.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,8 @@ ImPlotTime MkGmtTime(struct tm *ptm) {
ImPlotTime t;
#ifdef _WIN32
t.S = _mkgmtime(ptm);
#elif PLATFORM_PS5
t.S = 0;
#else
t.S = timegm(ptm);
#endif
Expand All @@ -926,6 +928,8 @@ tm* GetGmtTime(const ImPlotTime& t, tm* ptm)
return ptm;
else
return nullptr;
#elif PLATFORM_PS5
return nullptr;
#else
return gmtime_r(&t.S, ptm);
#endif
Expand All @@ -945,6 +949,8 @@ tm* GetLocTime(const ImPlotTime& t, tm* ptm) {
return ptm;
else
return nullptr;
#elif PLATFORM_PS5
return nullptr;
#else
return localtime_r(&t.S, ptm);
#endif
Expand Down