taskbar icon

7 files changed, 12 insertions, 4 deletions

diff --git a/build.cmd b/build.cmd
index cf6d9e9..d9e6d4f 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,5 +1,6 @@
 

 REM cl src/mongoose.c -c

+REM rc res/res.rc

 

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

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

 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
index 0000000..ee73a7d
--- /dev/null
+++ b/res/msys2.ico
diff --git a/res/res.rc b/res/res.rc
new file mode 100644
index 0000000..9369509
--- /dev/null
+++ b/res/res.rc
@@ -0,0 +1,3 @@
+#include "resource.h"

+

+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
index 0000000..77bdd8c
--- /dev/null
+++ b/res/res.res
diff --git a/res/resource.h b/res/resource.h
new file mode 100644
index 0000000..dd1af7b
--- /dev/null
+++ b/res/resource.h
@@ -0,0 +1,4 @@
+#define IDI_MY_ICON 101

+

+

+

diff --git a/src/main.cpp b/src/main.cpp
index 5056acf..a590411 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,8 +5,6 @@
 #include "win.h"

 #include "ws.h"

 

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

-

 #define LAY_IMPLEMENTATION

 #include "layout.h"

 

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

 #include <CommCtrl.h>

 

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

+

 #include "layout.h"

 

 #include <functional>

@@ -148,7 +150,7 @@ Window(string title, string className, HINSTANCE hInstance)
   _::niData.cbSize = sizeof(_::niData);

   _::niData.uID = 12345;

   _::niData.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;

-  _::niData.hIcon = LoadIconA(nullptr, IDI_WINLOGO);

+  _::niData.hIcon = LoadIconA(hInstance, MAKEINTRESOURCEA(IDI_MY_ICON));

   _::niData.hWnd = result;

   _::niData.uCallbackMessage = WM_APP+1;

   _::niData.uVersion = NOTIFYICON_VERSION_4;