taskbar icon

diff --git a/build.cmd b/build.cmd
index cf6d9e9bff7b2cdc041eacf09eaed85e6e6d46d6..d9e6d4ffccb70585ad5ddf5dc166cd034eabe628 100644 (file)
--- a/build.cmd
+++ b/build.cmd
@@ -1,5 +1,6 @@
 \r
 REM cl src/mongoose.c -c\r
 \r
 REM cl src/mongoose.c -c\r

+REM rc res/res.rc\r

 \r
 \r

-cl /EHsc src/main.cpp mongoose.obj /link user32.lib gdi32.lib shell32.lib Shlwapi.lib ws2_32.lib\r
+cl /EHsc src/main.cpp mongoose.obj /link user32.lib gdi32.lib shell32.lib Shlwapi.lib ws2_32.lib res/res.res\r

 mt -manifest .\main.exe.manifest -outputresource:main.exe;1
\ No newline at end of file
 mt -manifest .\main.exe.manifest -outputresource:main.exe;1
\ No newline at end of file

diff --git a/res/msys2.ico b/res/msys2.ico
new file mode 100644 (file)
index 0000000..ee73a7d
Binary files /dev/null and b/res/msys2.ico differ

diff --git a/res/res.rc b/res/res.rc
new file mode 100644 (file)
index 0000000..9369509
--- /dev/null
+++ b/res/res.rc
@@ -0,0 +1,3 @@
+#include "resource.h"\r
+\r
+IDI_MY_ICON ICON "msys2.ico"
\ No newline at end of file

diff --git a/res/res.res b/res/res.res
new file mode 100644 (file)
index 0000000..77bdd8c
Binary files /dev/null and b/res/res.res differ

diff --git a/res/resource.h b/res/resource.h
new file mode 100644 (file)
index 0000000..dd1af7b
--- /dev/null
+++ b/res/resource.h
@@ -0,0 +1,4 @@
+#define IDI_MY_ICON 101\r
+\r
+\r
+\r

diff --git a/src/main.cpp b/src/main.cpp
index 5056acf844a0b702d4de597004f95c7909942eda..a59041103694d92ca1d4623e5f220ff14ec7fdd5 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,8 +5,6 @@
 #include "win.h"\r
 #include "ws.h"\r
 \r
 #include "win.h"\r
 #include "ws.h"\r
 \r

-#include "../res/resource.h"\r
-\r

 #define LAY_IMPLEMENTATION\r
 #include "layout.h"\r
 \r
 #define LAY_IMPLEMENTATION\r
 #include "layout.h"\r
 \r

diff --git a/src/win.h b/src/win.h
index 9d21f680bf7001dd3d8ee09ecdbe0135e951b2d4..167e162d9b6858c7979eaaafa077f05210d0d54d 100644 (file)
--- a/src/win.h
+++ b/src/win.h
@@ -5,6 +5,8 @@ processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
 #include <windows.h>\r
 #include <CommCtrl.h>\r
 \r
 #include <windows.h>\r
 #include <CommCtrl.h>\r
 \r

+#include "../res/resource.h"\r
+\r

 #include "layout.h"\r
 \r
 #include <functional>\r
 #include "layout.h"\r
 \r
 #include <functional>\r


@@ -148,7 +150,7 @@ Window(string title, string className, HINSTANCE hInstance)
   _::niData.cbSize = sizeof(_::niData);\r
   _::niData.uID = 12345;\r
   _::niData.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;\r
   _::niData.cbSize = sizeof(_::niData);\r
   _::niData.uID = 12345;\r
   _::niData.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;\r

-  _::niData.hIcon = LoadIconA(nullptr, IDI_WINLOGO);\r
+  _::niData.hIcon = LoadIconA(hInstance, MAKEINTRESOURCEA(IDI_MY_ICON));\r

   _::niData.hWnd = result;\r
   _::niData.uCallbackMessage = WM_APP+1;\r
   _::niData.uVersion = NOTIFYICON_VERSION_4;\r
   _::niData.hWnd = result;\r
   _::niData.uCallbackMessage = WM_APP+1;\r
   _::niData.uVersion = NOTIFYICON_VERSION_4;\r