From ae45a9918bcecb0b51bc12a280f0bbcf7e53b4db Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Thu, 16 Jun 2022 23:31:22 +0200 Subject: [PATCH] Fix build Fix stupid visual studio paths My gosh, you suck! Why cannot it be **easily** possible to include icons RELATIV THE THE FUCKING SOLUTION?! FUCK MICROCRAP --- GlosSIConfig/GlosSIConfig.vcxproj | 3 +- GlosSIConfig/GlosSIConfig.vcxproj.filters | 7 ++--- GlosSIConfig/RCa37628 | Bin 0 -> 5264 bytes GlosSIConfig/Resource.rc | 34 ++++++---------------- GlosSIConfig/resource.h | 4 ++- GlosSIConfig/resource1.h | 16 ---------- 6 files changed, 15 insertions(+), 49 deletions(-) create mode 100644 GlosSIConfig/RCa37628 delete mode 100644 GlosSIConfig/resource1.h diff --git a/GlosSIConfig/GlosSIConfig.vcxproj b/GlosSIConfig/GlosSIConfig.vcxproj index 27d75f2..9fa364f 100644 --- a/GlosSIConfig/GlosSIConfig.vcxproj +++ b/GlosSIConfig/GlosSIConfig.vcxproj @@ -153,7 +153,6 @@ - @@ -165,7 +164,7 @@ - + diff --git a/GlosSIConfig/GlosSIConfig.vcxproj.filters b/GlosSIConfig/GlosSIConfig.vcxproj.filters index 1f02ba1..58136fc 100644 --- a/GlosSIConfig/GlosSIConfig.vcxproj.filters +++ b/GlosSIConfig/GlosSIConfig.vcxproj.filters @@ -84,9 +84,6 @@ Header Files - - Header Files - Header Files @@ -102,8 +99,8 @@ - - Resource Files + + Resource Files \ No newline at end of file diff --git a/GlosSIConfig/RCa37628 b/GlosSIConfig/RCa37628 new file mode 100644 index 0000000000000000000000000000000000000000..1ee8931259a25ecc10f7cf13ab57271773c6e2de GIT binary patch literal 5264 zcmdUz+fE}#5QghIQr@9s-(-~y!5qYrJFvmA;su0_m6ebz$Ji{%u8kN7yHXxL-`_P2 zGsZULBzZL&&rEey*P;Kau6ETv*p*FeWWj1yv4;I<=UjV{KCtch)v&1z?an^JH?dpG zBDIHP26X^$-#XCm>;l@9uM@lB`5XMh2mU5}QzSapit@$pIwKPsBYhdiPLa%@-7(LQ z_qF(}*w^-zRZBLD@&i|}w@448UP+G88?0z!u)2N670@9+M(_^c8ew(dy{s{yU$b4= zH9Tukv-G$HirEl5^SJs1noh5{xM$d&J^r>~2JF zRv$envjY`nUR_D!o@0*)*)T^)jc6{G+-J^atW+V!W6>UPZtM9zAS`(7iYu^bn^9gh zZoW33|52aptxy$accIyOcMdMj$rj&*D!e~u$!@e{bD<^DJZs0_)v^T=J>uFC)G;Uv zJ=>qwwx_r&#%{}Y;#^-67JFpm4b@DY(&WMVSqv&$MeC8}eSQz9C+eKk5A-AI4tZCH zQyfvWM3>|tTx~|n903fxj`t4FTI4)o?qiU7MwRQnfIrQA7^_ngyWUczI@AWu{s}yf z8F7z_RYmpl0Q{VhH$@8{=W+SkgY<~XpAoNR-0KDIgr_3^F_!tfTUe)SE0;)qbm^~7 zu&k^-jd~p}^CX?+Tu`+>CWeYb1+BNNvvTy3wYb8Q5i6oDcbaG9GHJJTH(L8Ezn;To zi5^i`k0i@0=v6PJnm@76;9wB@^-A1JD)={wd*%(i>aMTpDSn4XUGn$bhuEjDjFBnN z4!`Q5@1d%La{XnE$*TtA#ctV=oirEweAiX%_Lt3D&XhFYI-Rxd9d4ajwAN+26lL`X zH#~JZnTF2Q`o>swXvXM?uJ%0f-Xa;GYZY|97xw^uN$3Qx zD&*@D;&*YE^mDrUTp>O~a>#6Y)A>L-ugnjTrddC5=_LO-AN|PF&yBLU6?f7)HTx)L zXp5ZHyK>qyrUOO0t!r7!?Qy&p`;cAs6ve9=EhzUi|IG{hx{Azg%f{$I|18q((maDPgrEG!Oq1vQattlHUF=P#>l? literal 0 HcmV?d00001 diff --git a/GlosSIConfig/Resource.rc b/GlosSIConfig/Resource.rc index 7afb4f1..9fd0612 100644 --- a/GlosSIConfig/Resource.rc +++ b/GlosSIConfig/Resource.rc @@ -1,6 +1,6 @@ // Microsoft Visual C++ generated resource script. // -#include "resource1.h" +#include "resource.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -27,12 +27,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US 1 TEXTINCLUDE BEGIN - "resource1.h\0" + "resource.h\0" END 2 TEXTINCLUDE BEGIN - "#include ""winres.h""\r\n" + "#include winres.h\r\n" "\0" END @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,7,004000070037 - PRODUCTVERSION 0,0,7,004000070037 + FILEVERSION 0,0,7,1 + PRODUCTVERSION 0,0,7,1 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - Config" - VALUE "FileVersion", "0.0.7.0-4-gcf7ad37" + VALUE "FileVersion", "0.0.7.1" VALUE "InternalName", "GlosSIConfig" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSIConfig.exe" - VALUE "ProductName", "GlosSi" - VALUE "ProductVersion", "0.0.7.0-4-gcf7ad37" + VALUE "ProductName", "GlosSI" + VALUE "ProductVersion", "0.0.7.1" END END BLOCK "VarFileInfo" @@ -91,7 +91,7 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. -IDI_ICON1 ICON "D:\\Alia5\\Documents\\Visual_Studio_Projects\\GlosSI\\GloSC_Icon.ico" +IDI_ICON1 ICON "..\GloSC_Icon.ico" #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// @@ -108,19 +108,3 @@ IDI_ICON1 ICON "D:\\Alia5\\Documents\\Visual_St ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - - - - - - - - - - - - - - - - diff --git a/GlosSIConfig/resource.h b/GlosSIConfig/resource.h index 7ca31da..191b694 100644 --- a/GlosSIConfig/resource.h +++ b/GlosSIConfig/resource.h @@ -1,12 +1,14 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by Resource.rc +// +#define IDI_ICON1 101 // Next default values for new objects // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 101 +#define _APS_NEXT_RESOURCE_VALUE 102 #define _APS_NEXT_COMMAND_VALUE 40001 #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/GlosSIConfig/resource1.h b/GlosSIConfig/resource1.h deleted file mode 100644 index 191b694..0000000 --- a/GlosSIConfig/resource1.h +++ /dev/null @@ -1,16 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Resource.rc -// -#define IDI_ICON1 101 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif