diff --git a/meshconsole/MeshConsole.rc b/meshconsole/MeshConsole.rc index cc7702f..479218e 100644 Binary files a/meshconsole/MeshConsole.rc and b/meshconsole/MeshConsole.rc differ diff --git a/meshconsole/MeshConsole.vcxproj b/meshconsole/MeshConsole.vcxproj index 630ca50..f3120c1 100644 --- a/meshconsole/MeshConsole.vcxproj +++ b/meshconsole/MeshConsole.vcxproj @@ -165,6 +165,9 @@ + + + {E377F156-BAED-4086-B534-3CC43164607A} MicrostackDuktape diff --git a/meshconsole/MeshConsole.vcxproj.filters b/meshconsole/MeshConsole.vcxproj.filters index 66f72b7..862ac74 100644 --- a/meshconsole/MeshConsole.vcxproj.filters +++ b/meshconsole/MeshConsole.vcxproj.filters @@ -344,4 +344,7 @@ + + + \ No newline at end of file diff --git a/meshconsole/MeshService.ico b/meshconsole/MeshService.ico new file mode 100644 index 0000000..913b70e Binary files /dev/null and b/meshconsole/MeshService.ico differ diff --git a/meshconsole/resource.h b/meshconsole/resource.h index b1b1c31..a2de764 100644 Binary files a/meshconsole/resource.h and b/meshconsole/resource.h differ diff --git a/meshservice/MeshService.aps b/meshservice/MeshService.aps index 1e127ff..f3eceed 100644 Binary files a/meshservice/MeshService.aps and b/meshservice/MeshService.aps differ diff --git a/meshservice/MeshService.rc b/meshservice/MeshService.rc index 3163a7c..a356e5f 100644 --- a/meshservice/MeshService.rc +++ b/meshservice/MeshService.rc @@ -184,6 +184,16 @@ BEGIN 0 END + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_MAINICON ICON "MeshService.ico" + #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/meshservice/MeshService.vcxproj b/meshservice/MeshService.vcxproj index f5d7435..17d2ce4 100644 --- a/meshservice/MeshService.vcxproj +++ b/meshservice/MeshService.vcxproj @@ -552,6 +552,7 @@ + diff --git a/meshservice/MeshService.vcxproj.filters b/meshservice/MeshService.vcxproj.filters index 67d68fe..7c40f45 100644 --- a/meshservice/MeshService.vcxproj.filters +++ b/meshservice/MeshService.vcxproj.filters @@ -30,6 +30,9 @@ Resource Files + + Resource Files + diff --git a/meshservice/resource.h b/meshservice/resource.h index 01de2c9..e08e9b6 100644 --- a/meshservice/resource.h +++ b/meshservice/resource.h @@ -5,6 +5,8 @@ #define IDD_INSTALLDIALOG 103 #define IDB_BITMAP_MC 108 #define IDD_DETAILSDIALOG 111 +#define IDI_MCICON 113 +#define IDI_MAINICON 113 #define IDC_BUTTON2 1002 #define IDC_INSTALLBUTTON 1002 #define IDC_BUTTON3 1004 @@ -37,7 +39,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 113 +#define _APS_NEXT_RESOURCE_VALUE 114 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1032 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/microscript/ILibDuktape_Commit.h b/microscript/ILibDuktape_Commit.h index de3c947..da38c6d 100644 --- a/microscript/ILibDuktape_Commit.h +++ b/microscript/ILibDuktape_Commit.h @@ -1,3 +1,5 @@ // This file is auto-generated, any edits may be overwritten -#define SOURCE_COMMIT_DATE "2022-Jan-17 15:14:56-0800" -#define SOURCE_COMMIT_HASH "44edd37fdbf2650de46cd04653525add37a15c6b" +#define SOURCE_COMMIT_DATE "2022-Feb-3 09:45:18-0800" +#define SOURCE_COMMIT_DATE "2022-Feb-3 09:45:18-0800" +#define SOURCE_COMMIT_HASH "0d354c9c52f532f204b6e6665888958449ece8c9" +#define SOURCE_COMMIT_HASH "0d354c9c52f532f204b6e6665888958449ece8c9"