From 61310bf1a31e227ba39ac1ca3aa1c33a73d11479 Mon Sep 17 00:00:00 2001 From: Marius Greuel Date: Tue, 6 Oct 2020 21:04:13 +0200 Subject: [PATCH] Add Windows version resource to avrdude project --- avrdude.vcxproj | 25 ++++++++++ avrdude.vcxproj.filters | 58 ++++++++++++++++------- msvc/avrdude.rc | Bin 0 -> 3312 bytes msvc/res/resource.rc2 | 16 +++++++ msvc/res/version.rc2 | 102 ++++++++++++++++++++++++++++++++++++++++ msvc/resource.h | Bin 0 -> 954 bytes msvc/version.h | 14 ++++++ 7 files changed, 197 insertions(+), 18 deletions(-) create mode 100644 msvc/avrdude.rc create mode 100644 msvc/res/resource.rc2 create mode 100644 msvc/res/version.rc2 create mode 100644 msvc/resource.h create mode 100644 msvc/version.h diff --git a/avrdude.vcxproj b/avrdude.vcxproj index d88fd3d4..17f1d23f 100644 --- a/avrdude.vcxproj +++ b/avrdude.vcxproj @@ -92,6 +92,9 @@ Console true + + DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + @@ -104,6 +107,9 @@ Console true + + DEBUG;_UNICODE;UNICODE;%(PreprocessorDefinitions) + @@ -121,6 +127,9 @@ true true + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + @@ -138,6 +147,9 @@ true true + + _UNICODE;UNICODE;%(PreprocessorDefinitions) + @@ -231,7 +243,9 @@ + + @@ -273,6 +287,17 @@ {22615ec5-9dbc-4538-9c01-2cd535b3810b} + + + + + + Text + + + Text + + diff --git a/avrdude.vcxproj.filters b/avrdude.vcxproj.filters index cddf0460..e80d4828 100644 --- a/avrdude.vcxproj.filters +++ b/avrdude.vcxproj.filters @@ -12,10 +12,13 @@ {be5ce6e6-223e-4d41-8915-29103d899c5a} - + + {a7668888-00c6-4911-9e47-7af645f31778} + + {dbbd7498-e1e9-4d80-b91f-137dc5b988f1} - + {1cc9d4fb-f03f-48cb-8af7-3e96681dc03b} @@ -168,22 +171,22 @@ 3 Generated Files - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc @@ -326,34 +329,53 @@ 3 Generated Files - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc\sys + 5 msvc\sys - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc - 4 msvc + 5 msvc + + + 2 Header Files + + + 4 Resource Files + + + 4 Resource Files + + + + + 4 Resource Files + + + 4 Resource Files + + \ No newline at end of file diff --git a/msvc/avrdude.rc b/msvc/avrdude.rc new file mode 100644 index 0000000000000000000000000000000000000000..c3a80f9946cbff213a3cc60dac9c2f9018229ca8 GIT binary patch literal 3312 zcmds)$!;1!5QhJAq`bpqxWq~XS)PC`7zGn+Se!^m$N}RZ5gf6|mppr%ue#kfFawrI z4wI-gR8LJ+b#*O&H+R2EDk;*LrW$FX8!dSzTEXkXTWYOK&3LQo6(iEMt~BRaz+XYf z@D@Xwo&B$fj>VzN zu0QkJWY<;pY4NDTf5)?%k=-0vSIm^&&br0DvI=ys+sc^I=REl_w`aI8FjSW=*lS-6zRoQcaE`G z)(7g+cV&kT?9rc9RvuDMEr!|s$%yu9cCnGr1w*vj=%2V%TX5TOd(eif^uY0Q4Qw~* z_EWvab_cl%9Ivx0G32Yq1z!QSm;DuB9oA1XRqKMaYoP%T~4p%U_iU7OyRhxQ(* zb@__8SR}7q9xnA2bh~oLgK2o!L00%p?;vQ?et5)AG>RuJ6x$Ux3kvn7$LTg zH0Em`jT*S(PvHrt^#aKY=iQjMTk`2^aJwt^XYKEx^=1U~H4oVd)H-rPF8@~~{Hh@T`1Tv!QH@Lh literal 0 HcmV?d00001 diff --git a/msvc/res/resource.rc2 b/msvc/res/resource.rc2 new file mode 100644 index 00000000..40df015a --- /dev/null +++ b/msvc/res/resource.rc2 @@ -0,0 +1,16 @@ +// +// resource.rc2 +// Copyright (C) 2020 Marius Greuel. All rights reserved. +// + +#ifdef APSTUDIO_INVOKED +#error this file is not editable by Microsoft Visual C++ +#endif //APSTUDIO_INVOKED + +#pragma code_page(1252) + +//////////////////////////////////////////////////////////////////////////// Version + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#include "version.rc2" diff --git a/msvc/res/version.rc2 b/msvc/res/version.rc2 new file mode 100644 index 00000000..0ef9e5b9 --- /dev/null +++ b/msvc/res/version.rc2 @@ -0,0 +1,102 @@ +// +// Version.rc2 +// Copyright (C) 2020 Marius Greuel. All rights reserved. +// + +///////////////////////////////////////////////////////////////////////////// + +#include "..\version.h" + +#define _STR(s) #s +#define _VER_STR(a, b, c, d) _STR(a) "." _STR(b) "." _STR(c) "." _STR(d) + +#ifndef VER_FILEVERSION +#define VER_FILEVERSION VER_MAJOR,VER_MINOR,VER_BUILD,VER_REVISION +#endif + +#ifndef VER_FILEVERSION_STR +#define VER_FILEVERSION_STR _VER_STR(VER_MAJOR, VER_MINOR, VER_BUILD, VER_REVISION) +#endif + +#ifndef VER_PRODUCTVERSION +#define VER_PRODUCTVERSION VER_FILEVERSION +#endif + +#ifndef VER_PRODUCTVERSION_STR +#define VER_PRODUCTVERSION_STR VER_FILEVERSION_STR +#endif + +#ifndef VER_COMPANYNAME_STR +#define VER_COMPANYNAME_STR "Marius Greuel" +#endif + +#ifndef VER_FILEDESCRIPTION_STR +#define VER_FILEDESCRIPTION_STR "AVRDUDE" +#endif + +#ifndef VER_PRODUCTNAME_STR +#define VER_PRODUCTNAME_STR "AVRDUDE" +#endif + +#ifndef VER_INTERNALNAME_STR +#define VER_INTERNALNAME_STR "avrdude.exe" +#endif + +#ifndef VER_LEGALCOPYRIGHT_STR +#define VER_LEGALCOPYRIGHT_STR "\251 2020 The AVRDUDE authors." +#endif + +#ifndef VER_ORIGINALFILENAME_STR +#define VER_ORIGINALFILENAME_STR VER_INTERNALNAME_STR +#endif + +#ifndef VER_FILETYPE +#define VER_FILETYPE VFT_APP +#define VER_FILESUBTYPE 0 +#endif + +#ifdef RC_INVOKED + +#ifdef DEBUG +#define VER_DEBUG VS_FF_DEBUG +#else +#define VER_DEBUG 0 +#endif + +#define VER_FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#define VER_FILEOS VOS__WINDOWS32 +#define VER_FILEFLAGS (VER_DEBUG) + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILEVERSION +PRODUCTVERSION VER_PRODUCTVERSION +FILEFLAGSMASK VER_FILEFLAGSMASK +FILEFLAGS VER_FILEFLAGS +FILEOS VER_FILEOS +FILETYPE VER_FILETYPE +FILESUBTYPE VER_FILESUBTYPE +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" // LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP + BEGIN +#ifdef VER_COMMENTS_STR + VALUE "Comments", VER_COMMENTS_STR +#endif + VALUE "CompanyName", VER_COMPANYNAME_STR + VALUE "FileDescription", VER_FILEDESCRIPTION_STR + VALUE "FileVersion", VER_FILEVERSION_STR + VALUE "InternalName", VER_INTERNALNAME_STR + VALUE "LegalCopyright", VER_LEGALCOPYRIGHT_STR + VALUE "OriginalFilename",VER_ORIGINALFILENAME_STR + VALUE "ProductName", VER_PRODUCTNAME_STR + VALUE "ProductVersion", VER_PRODUCTVERSION_STR + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0409, 1200 //LANG_ENGLISH/SUBLANG_ENGLISH_US, Unicode CP + END +END + +#endif // RC_INVOKED diff --git a/msvc/resource.h b/msvc/resource.h new file mode 100644 index 0000000000000000000000000000000000000000..5fc0827ae2d3b9741d1a300f5fd99c13fddbf8dc GIT binary patch literal 954 zcma)*Z%e{p6vfYLKgFPzfo4JV*0u%F{>V(JSEAE}Aqq~dh`xIDyPHZVOu1~&y_fTx zoqL{VzdsE%^hHF9)t4tgb!Ofo#Z8sEJZ7G*`}(X-Tg~FV{)~O{rX+ z6OLXr){JLCf5|$cH=&b)T2YOuGdfeU`i{Q~Q;8kw6U0Dk7)F~Nb@FtBt?8^_F%J8V zgIZ4sbF`SEt$^Ake`1Z9$vGNLT@baMmI&65VnS1!p=E_yn|NK!x}uv?WjL{5H5Koy za}D)Io`TJHY^HYtw&ZdOl^xV|QEdwQyd%7f^@!^p`%3(*Vn+h91=i*Z^a4kRcc?o$ z0r{avr8^yv<(Y@N$ED-mY!S^PoW7o!sn0ps&54;Vf#0XoLuo+mAAHSxKb6;oGbCE* z_bOQ(UFlLcy4LN9nvFX`eNwnrrPx8Q-4(kn`?v7F!&^7XQ?XO6W;K_a1-J3q|1&D? H%zpI;>JWyB literal 0 HcmV?d00001 diff --git a/msvc/version.h b/msvc/version.h new file mode 100644 index 00000000..4ee4c8da --- /dev/null +++ b/msvc/version.h @@ -0,0 +1,14 @@ +// +// version.h +// Copyright (C) 2020 Marius Greuel. All rights reserved. +// + +#define PRD_MAJOR 6 +#define PRD_MINOR 3 +#define PRD_BUILD 1 +#define PRD_REVISION 0 + +#define VER_MAJOR PRD_MAJOR +#define VER_MINOR PRD_MINOR +#define VER_BUILD PRD_BUILD +#define VER_REVISION PRD_REVISION