summaryrefslogtreecommitdiffstats
path: root/src/skel/glfw
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-02-13 15:50:56 +0100
committerwithmorten <morten.with@gmail.com>2021-02-13 17:01:47 +0100
commit8d27dba4cdec4d3b39bf87ce5baef5962e58312c (patch)
tree8926a47efc1d9526ef5b375ce79e6893a04367ea /src/skel/glfw
parentDisable RANDOMSPLASH only if loading screen is disabled (diff)
downloadre3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.tar
re3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.tar.gz
re3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.tar.bz2
re3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.tar.lz
re3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.tar.xz
re3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.tar.zst
re3-8d27dba4cdec4d3b39bf87ce5baef5962e58312c.zip
Diffstat (limited to 'src/skel/glfw')
-rw-r--r--src/skel/glfw/glfw.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index b44e5750..baed9000 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -52,6 +52,11 @@ long _dwOperatingSystemVersion;
#define MAX_SUBSYSTEMS (16)
+#ifdef _WIN32
+#define GLFW_EXPOSE_NATIVE_WIN32
+#include <GLFW/glfw3native.h>
+#endif
+
rw::EngineOpenParams openParams;
@@ -1560,6 +1565,15 @@ main(int argc, char *argv[])
return 0;
}
+#ifdef _WIN32
+ HWND wnd = glfwGetWin32Window(PSGLOBAL(window));
+
+ HICON icon = LoadIcon(instance, MAKEINTRESOURCE(IDI_MAIN_ICON));
+
+ SendMessage(wnd, WM_SETICON, ICON_BIG, (LPARAM)icon);
+ SendMessage(wnd, WM_SETICON, ICON_SMALL, (LPARAM)icon);
+#endif
+
psPostRWinit();
ControlsManager.InitDefaultControlConfigMouse(MousePointerStateHelper.GetMouseSetUp());