Skip to content
This repository was archived by the owner on Sep 6, 2023. It is now read-only.

Commit 6dc9a77

Browse files
update libraries
1 parent 6a38170 commit 6dc9a77

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

OFS-lib/imgui_impl/imgui_impl_opengl3.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@
112112
#pragma clang diagnostic ignored "-Wold-style-cast" // warning: use of old-style cast
113113
#pragma clang diagnostic ignored "-Wsign-conversion" // warning: implicit conversion changes signedness
114114
#endif
115+
#if defined(__GNUC__)
116+
#pragma GCC diagnostic push
117+
#pragma GCC diagnostic ignored "-Wcast-function-type" // warning: cast between incompatible function types
118+
#endif
115119

116120
// GL includes
117121
#if defined(IMGUI_IMPL_OPENGL_ES2)
@@ -924,6 +928,9 @@ static void ImGui_ImplOpenGL3_ShutdownPlatformInterface()
924928
ImGui::DestroyPlatformWindows();
925929
}
926930

931+
#if defined(__GNUC__)
932+
#pragma GCC diagnostic pop
933+
#endif
927934
#if defined(__clang__)
928935
#pragma clang diagnostic pop
929936
#endif

OFS-lib/state/states/KeybindingState.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ enum OFS_KeyMod : int32_t
9595
OFS_KeyMod_Shift = 1 << 13,
9696
OFS_KeyMod_Alt = 1 << 14,
9797
OFS_KeyMod_Super = 1 << 15,
98-
OFS_KeyMod_Mask_ = 0xF000,
98+
OFS_KeyMod_Mask_ = 0xF800,
9999
};
100100

101101
static std::unordered_map<OFS_Key, ImGuiKey> GetOfsToImGuiMap() noexcept

lib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ if(OFS_PROFILE)
138138
target_compile_definitions(tracy PUBLIC "TRACY_ENABLE")
139139
endif()
140140

141-
set(SOL2_LUA_VERSION "5.4" CACHE BOOL "" FORCE)
141+
set(SOL2_LUA_VERSION "5.4.4" CACHE BOOL "" FORCE)
142142
set(SOL2_BUILD_LUA OFF CACHE BOOL "" FORCE)
143143
add_subdirectory("sol2/")
144144

lib/SDL2

Submodule SDL2 updated 808 files

lib/sol2

Submodule sol2 updated 524 files

0 commit comments

Comments
 (0)