Merge branch 'main' of https://git.neru.rip/neru/HexUnlocked

.github/workflows/build.yml

@@ -74,6 +74,7 @@ jobs:
     - name: Configure CMake
       run: |
         cmake -B build -S . -G Ninja \
+          -DCMAKE_BUILD_TYPE=Release \
           -DCMAKE_SYSTEM_NAME=Windows \
           -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \
           -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ \

CMakeLists.txt

@@ -147,6 +147,9 @@ set_target_properties(hex-unlocked PROPERTIES OUTPUT_NAME "${RANDOM_EXE_NAME}")
 # compiler / IDE config
 if(NOT MSVC)
     target_link_options(hex-unlocked PRIVATE -static -static-libgcc -static-libstdc++)
+    if(CMAKE_BUILD_TYPE MATCHES "Release|MinSizeRel")
+        target_link_options(hex-unlocked PRIVATE -s)
+    endif()
 else()
     set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT hex-unlocked)
 endif()

README.md

@@ -1,4 +1,6 @@
 <h1 align="center">
+    <img src="img/favicon.ico" height="64">
+    <br/>
     <b>Hex: Unlocked</b>
 </h1>
 

src/unlocker/main.cpp

@@ -17,11 +17,6 @@
 #include <processthreadsapi.h>
 #include <handleapi.h>
 
-#ifndef CREATE_NO_WINDOW
-    // from: WinBase.h
-    #define CREATE_NO_WINDOW 0x08000000
-#endif
-
 bool running = true;
 TinyMITMProxy* proxy = nullptr;
 ProxyConfigurator* conf = nullptr;

src/unlocker/tray-icon.cpp

@@ -84,7 +84,7 @@ bool TrayIcon::init()
     nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
     nid.uCallbackMessage = WM_TRAYICON;
 
-    nid.hIcon = LoadIcon(NULL, IDI_APPLICATION);
+    nid.hIcon = LoadIconA(GetModuleHandle(NULL), "IDI_ICON1");
     strncpy_s(nid.szTip, "HexUnlocked", sizeof(nid.szTip) - 1);
     nid.szTip[sizeof(nid.szTip) - 1] = '\0';