From 347903cfb5a476c63a3edb6d52813030ecf471d2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Skibinski Date: Tue, 25 Oct 2016 10:34:41 +0200 Subject: [PATCH] Windows resources moved to programs/windres/ --- build/VS2010/zstd/generate_res/zstd32.res | Bin 948 -> 0 bytes build/VS2010/zstd/generate_res/zstd64.res | Bin 948 -> 0 bytes build/VS2010/zstd/zstd.rc | 6 +++--- programs/Makefile | 4 ++-- programs/windres/zstd32.res | Bin 0 -> 1044 bytes programs/windres/zstd64.res | Bin 0 -> 1044 bytes 6 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 build/VS2010/zstd/generate_res/zstd32.res delete mode 100644 build/VS2010/zstd/generate_res/zstd64.res create mode 100644 programs/windres/zstd32.res create mode 100644 programs/windres/zstd64.res diff --git a/build/VS2010/zstd/generate_res/zstd32.res b/build/VS2010/zstd/generate_res/zstd32.res deleted file mode 100644 index 75705d06802ba59bc017e31c22f8c6169ec8a645..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc-jL100001 literal 948 zc-nna%}N4c6g{JZVYF!3aux*%C1w&8LQy6Pl93_RrbI^@uu*0vC|5m1>z<((2zsO5 zAUgNXn4?x#zQ23VxqsfN83sgNlR$VgjjZQ;ZA|2nwj$4$WcU``A#xv>5(CTJSAgeP zz2I}d=+h=p5&!Z`#!Sfqwd8CQ0Y8=72>T^=zNVDq@ZR0Vj*~J<;HNJX^ zmdc0hi)7Jb7E=Gb&cZsi8J>AY-oiFEquUNMw*KrSu&+7RBVSIG@4@)|SP36x|7O={h1TJWmI6m#IsToL{Z)PQ$ O)dj@AL_&9 z#Dn4{A-D!Y_;BH&OEnigI8^q~L7$kCVsa>Q?&y9X`C}W4v>y_4hXGo|KQfyZZ;onT zs?CF?n4YSJv=5OXZycx08KAB42lTtdddjbmAJAf{j?LX+MjayBoDOZ`Ye(^Y)d?cL zaC)q!ueu>_iIK66)Ku&yr~ku|kw;di)K@^7*qX)>oTr+T3Wu7VO|*lDsAdnV*~u{W|6M6()cY1uw!Yic9A~zR(>*NfJ8UX{{$&9xe3QUAy%Hy&zZH7}Y4gpj Njz5FgmuRR(*xzhwdME$@ diff --git a/build/VS2010/zstd/zstd.rc b/build/VS2010/zstd/zstd.rc index 464b2f143..f5e404730 100644 --- a/build/VS2010/zstd/zstd.rc +++ b/build/VS2010/zstd/zstd.rc @@ -32,11 +32,11 @@ BEGIN BEGIN BLOCK "040904B0" BEGIN - VALUE "CompanyName", "Yann Collet" - VALUE "FileDescription", "Fast and efficient compression algorithm" + VALUE "CompanyName", "Yann Collet, Facebook, Inc." + VALUE "FileDescription", "Zstandard - Fast and efficient compression algorithm" VALUE "FileVersion", ZSTD_VERSION_STRING VALUE "InternalName", "zstd.exe" - VALUE "LegalCopyright", "Copyright (C) 2013-2016, Yann Collet" + VALUE "LegalCopyright", "Copyright (c) 2013-present, Yann Collet, Facebook, Inc." VALUE "OriginalFilename", "zstd.exe" VALUE "ProductName", "Zstandard" VALUE "ProductVersion", ZSTD_VERSION_STRING diff --git a/programs/Makefile b/programs/Makefile index 0ed7f3d07..013f54354 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -57,8 +57,8 @@ endif ifneq (,$(filter Windows%,$(OS))) EXT =.exe VOID = nul -RES64_FILE = ..\build\VS2010\zstd\generate_res\zstd64.res -RES32_FILE = ..\build\VS2010\zstd\generate_res\zstd32.res +RES64_FILE = windres\zstd64.res +RES32_FILE = windres\zstd32.res ifneq (,$(filter x86_64%,$(shell $(CC) -dumpmachine))) RES_FILE = $(RES64_FILE) else diff --git a/programs/windres/zstd32.res b/programs/windres/zstd32.res new file mode 100644 index 0000000000000000000000000000000000000000..aec8fcf24e4f15e1915af725ba5b957fa3e7b50a GIT binary patch literal 1044 zc-oy)OG^S_6g}e%hOJt*XfcZx1tw|+6+uxZ36hZ^6+)P=hHR8^f@;-oh!*{fmMseU zM{Qb5=iV7pGg@?q?{)9F=RW593WfoZz6k_7%Sd=VuZE$#(6+(#(+tjn+d}dkV`5;2 z^DJ=xQ!n`BFZ!4T>~VL@Q89;>ikabDMhRz}cX7yF9!2c)oadb5UgXXC=m-1;M%T@d z$Kn?m4~o}_AWHDz!GVhw*&MXdAhU}mI>bCFCW#Ekny%ZDKl7ZUeutPVbWtV#mf2K! zYAE-K>Ri~0X)CLbIL|p+YCN4&-@&EoBwh^(`aNKUyn{Tl96eejzb^e9dbrAeO1-Z! z>YP2!HkLwmvDl%_CPR~-Ll%d7S8cU0Z%_GqA+Pwf*@ceA^Kn6pNF33ToXQ;Dw~t7Q znFj+%BSvgq;|R`G&S7WnG`l*{4cvsidc-Py3OuzGEgkE!pOQt3S@^_E>TE2qjzz9% z{*e@xS^uD-pib%RfB(a})=>=OIbj`x9=Lzjlfg8759r&W<(iEC*xi`?ck(8p6FxsX tJ=*82-tMycPu^N!p7$L%qE+JbXs?dlpP2P50DW^JQy6{e@^(yR_yRW3jTHa@ literal 0 Hc-jL100001 diff --git a/programs/windres/zstd64.res b/programs/windres/zstd64.res new file mode 100644 index 0000000000000000000000000000000000000000..0fa5040fdcbbefa37181a94ef937804049e80bb9 GIT binary patch literal 1044 zc-oy)OG^S_6g@hFV5^obTFjzFfr*+yMNpJULS$q}g%IYeAsc0!pjx%+2Skg0M#~lj z{i8OmrE~9$>1ed*4&UqEbI*Nz-_#!>5a}C$zcZ0^du|Owd8KWg>zCo51-FUR2SO6T zH0K%Meq1m3)GzwD3G8xr%uz9hmWq+(Tt*3JoOf`@T>(Yx^IYJZ=U(L9{OtSu5sa=I z0guTq8V-uLs31!4;KGK37TIjH(IB&fCOX7CD<*|3$EvPdl0WmDrGA^3D|AsM{+8KP zd1@&4iRv6!ifJpWhXl`gT53FLgwbN%}ovnY@EMavVKcB)=~GZF)G$e@eZl zG3uOM&K4E}cClE2%_2jSpG_8&aq@z6bQ}&~i;iFZ4Dh?@s=S*o4n` sr$_so)7M>A|H)Si%<;VgN3=?u9_`i8`-z(`0?>a>#0dTA5!DFb8?sG}tpET3 literal 0 Hc-jL100001 -- 2.47.2