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 HcmV?d00001 literal 948 zcmeZaWMlw=dCUw95EcugUQuyTGDr}LBbXT&Y#10ArZ7VUK1Th3Ncry4i z_%XyYcry4gxH0&HmF;DD{}1G9hz$@HNWvaOFfcH%Ft9K%LD?`WfeEB8n4yHBh#`|9 zk0G7GjUkgEhar{0lOc~GjUk_bfx!l>#(=?u!GOV%0Yp177%(s}STOJ~FfuqZ4+84S5#Gj$l)kn9d)NM$Hufaw7#Fl5kU0AY~-j2Ji>7{TFC0#=vDkjRjO zrxo>7*ZK3pnlF{P-S3b@L@=0NC&G1g-!uOCD;||3>gd{|6__NFlaD1GiWj> zFc>iyFc>lzGw4EDW(+zE3JkbHl7Ybr>_&g6`JfmCxe*qJAQwYo1Djh-7`PZ183GuJ z81flX7)lwE8A_0R$G{K;_8%x-Qy3B%iWpKD7#Iw|;fJaRJrqIV2g0B*bYTFcuQ0HF xn5z&ei-AFffrWvAA%vj_9LL2BISh#?X@HYu0}CimfZ~Ro0XZjvavd{RHvlVcd5{1A diff --git a/build/VS2010/zstd/generate_res/zstd64.res b/build/VS2010/zstd/generate_res/zstd64.res deleted file mode 100644 index 85de277c7f3145bcbcd9df4fbcbccd766163ccdb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 948 zcmYdkV`Kn1Th3Ncry4i z_%XyYcry4gxH0&HmF;DD{}1G9hz$@HNWvaOFfcH%Ft9K%LD?`WfeEB8n4yHBh#`|9 zk0G7GjUkgEhar{0lOc~GjUk_bfx!l>#(=?u!GOV%0Yp177%(s}STOJ~FfuqZ4+84S5#Gj$l)kn9d)NM$Hufaw7#Fl5kU0AY~-j2Ji>7{TFC0#=vDkjRjO zrxo>7*ZK3pnlF{P-S3b@L@=0NC&G1g-!uOCD;||3>gd{|6__NFlaD1GiWj> zFc>iyFc>lzGw4EDW(+zE3JkbHl7Ybr>_&g6`JfmCxe*qJAQwYo1Djh-7`PZ183GuJ z81flX7)lwE8A_0R$G{K;_8%x-Qy3B%iWpKD7#Iw|;fJaRJrqIV2g0B*bYTFcuQ0HF wn5z&ei-AFffrWvAA%vj_9LL2BISh#?X@HYu0}CimfZ~Q3B`1P%9Wz)r0BmY{C;$Ke 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 zcmeZaWMlw=f6NRF5EcugUQuyTGDr}LcQ7+B*f20Kd|`$NfYdoK7#x7`U?d}h00RSq z1Or0@OawwRg3UF+BF@Rez~I5az!1T}zz_p98>Aa>!5^fIVK2-3e;`*wYygoUmoYNfgJl^QSQuCsn4oMJwTB6$BbcFt zp@<=qA&()Q!Hpr4A%`KA!IL46A&nuQfq`KLSd9UL34;NHB?E|dVlV)^Q-*<&!I>eS zA(x?mA(0`Ep_0LmA(0`MAr)+VBv>quK>@5L2W)BygARiNgBwF4Lo!1uLlQ$iLq0<` zSPW!eGJ_ri1H&W+QwB!3J6sr28HyQ_!R{+yC}GHC$Y;m{n;*qc%uoWhBZVQ6p@<=c zL4iRRYC1?p0V=1!kjjw8kj9Y7kj#+Dkjjw9P{N?VkPLNq5!n1 z7%~`g!FK5|upzlAj3JewhykVtq`;6tj{$-i7>pP=85qIgR{~a-$B@X7gA_7VV0Wi5 z=rN=+R6xUO3WEg$BZCh^DnmM0H7HaI7%IW8NN31kC}Cg#ha#$&0)qxaGJ__A0)r8Q z0fQlfF@r8c0RzNG5PyO~o7{M?0{g=s>IP8i0Qm!!K0v;L#56Ylm@sfLFfs%%6fxv8 zq%f2+Br}vCg#ZHsX529_7=XhVRS$YdL&6vo)(i|T44||d29A4}t3as;l4=Aa>!5^fIVK2-3e;`*wYygoUmoYNfgJl^QSQuCsn4oMJwTB6$BbcFt zp@<=qA&()Q!Hpr4A%`KA!IL46A&nuQfq`KLSd9UL34;NHB?E|dVlV)^Q-*<&!I>eS zA(x?mA(0`Ep_0LmA(0`MAr)+VBv>quK>@5L2W)BygARiNgBwF4Lo!1uLlQ$iLq0<` zSPW!eGJ_ri1H&W+QwB!3J6sr28HyQ_!R{+yC}GHC$Y;m{n;*qc%uoWhBZVQ6p@<=c zL4iRRYC1?p0V=1!kjjw8kj9Y7kj#+Dkjjw9P{N?VkPLNq5!n1 z7%~`g!FK5|upzlAj3JewhykVtq`;6tj{$-i7>pP=85qIgR{~a-$B@X7gA_7VV0Wi5 z=rN=+R6xUO3WEg$BZCh^DnmM0H7HaI7%IW8NN31kC}Cg#ha#$&0)qxaGJ__A0)r8Q z0fQlfF@r8c0RzNG5PyO~o7{M?0{g=s>IP8i0Qm!!K0v;L#56Ylm@sfLFfs%%6fxv8 zq%f2+Br}vCg#ZHsX529_7=XhVRS$YdL&6vo)(i|T44||d29A4}t3as;l4=