windows: add icon and version informations

diff --git a/cpuminer.vcxproj b/cpuminer.vcxproj
index 2c45b6c6588fcda951b11a8439683b9110be9d44..e85ab68c38f5b8d7c4c34cd374a90e19bb92abde 100644 (file)
--- a/cpuminer.vcxproj
+++ b/cpuminer.vcxproj
@@ -273,6 +273,7 @@
     <ClInclude Include="lyra2\Lyra2.h" />
     <ClInclude Include="lyra2\Sponge.h" />
     <ClInclude Include="miner.h" />
+    <ClInclude Include="res\resource.h" />
     <ClInclude Include="scryptjane\scrypt-jane-chacha.h" />
     <ClInclude Include="scryptjane\scrypt-jane-hash.h" />
     <ClInclude Include="scryptjane\scrypt-jane-hash_keccak.h" />
@@ -336,6 +337,12 @@
     <None Include="asm\scrypt-arm.S" />
     <None Include="asm\sha2-arm.S" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="res\cpuminer.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\cpuminer.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <!-- Copy the required dlls -->
   <Target Name="AfterBuild">

diff --git a/cpuminer.vcxproj.filters b/cpuminer.vcxproj.filters
index 437e1d2a2e849693289cee64d93d302daa40a959..332155085fd264a871db6a22e9b318fa4c4106fc 100644 (file)
--- a/cpuminer.vcxproj.filters
+++ b/cpuminer.vcxproj.filters
@@ -418,6 +418,9 @@
     <ClInclude Include="crypto\int-util.h">
       <Filter>crypto</Filter>
     </ClInclude>
+    <ClInclude Include="res\resource.h">
+      <Filter>res</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="sph">
@@ -453,6 +456,9 @@
     <Filter Include="algo">
       <UniqueIdentifier>{34f266e4-b48f-4721-ac34-474b65726498}</UniqueIdentifier>
     </Filter>
+    <Filter Include="res">
+      <UniqueIdentifier>{5969f6d8-98c0-49c9-8e4c-51c54b5f0e16}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="asm\scrypt-arm.S">
@@ -462,4 +468,14 @@
       <Filter>algo</Filter>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="res\cpuminer.ico">
+      <Filter>res</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="res\cpuminer.rc">
+      <Filter>res</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

diff --git a/mingw64.sh b/mingw64.sh
index 1c04245bbcdbfddbb7c40bbab756881d45e8dcb1..892128e364520fd2caaf64de94b62dcb558d5ebc 100644 (file)
--- a/mingw64.sh
+++ b/mingw64.sh
@@ -13,9 +13,17 @@ extracflags="-O3 -Wall -D_REENTRANT -fmerge-all-constants" # -funroll-loops -fva
 CFLAGS="-DCURL_STATICLIB -DOPENSSL_NO_ASM -DUSE_ASM $extracflags"
 # CPPFLAGS=""
 
-./configure --build=x86_64-w64-mingw32 --with-crypto=$SSL_PREFIX --with-curl=$CURL_PREFIX CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS"
+# icon
+windres res/icon.rc icon.o
+
+./configure --build=x86_64-w64-mingw32 --with-crypto=$SSL_PREFIX --with-curl=$CURL_PREFIX \
+       CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" LDFLAGS="icon.o"
 
 make
 
 strip -p --strip-debug --strip-unneeded cpuminer.exe
 
+if [ -e sign.sh ] ; then
+. sign.sh
+fi
+

diff --git a/res/cpuminer.ico b/res/cpuminer.ico
new file mode 100644 (file)
index 0000000..950b6d4
Binary files /dev/null and b/res/cpuminer.ico differ

diff --git a/res/cpuminer.rc b/res/cpuminer.rc
new file mode 100644 (file)
index 0000000..0d5dc04
Binary files /dev/null and b/res/cpuminer.rc differ

diff --git a/res/cpuminer.svg b/res/cpuminer.svg
new file mode 100644 (file)
index 0000000..55eff3a
--- /dev/null
+++ b/res/cpuminer.svg
@@ -0,0 +1 @@
+<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'><svg enable-background="new 0 0 128 128" height="128px" id="Layer_1" version="1.1" viewBox="0 0 128 128" width="128px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><circle cx="64" cy="64" fill="#29D682" r="64"/><path d="M32.67,45.962c-0.55,0-1.272,0.358-1.604,0.797l-1.823,2.407c-0.332,0.438-1.054,0.796-1.604,0.796H21.67  c-0.55,0-1,0.45-1,1v5c0,0.55,0.45,1,1,1h6c0.55,0,1.27-0.359,1.6-0.8l1.8-2.4c0.33-0.44,1.05-0.8,1.6-0.8h5c0.55,0,1-0.45,1-1v-5  c0-0.55-0.45-1-1-1H32.67z" fill="#FFFFFF"/><g><g><path d="M52.67,25c0-0.55-0.45-1-1-1h-5c-0.55,0-1,0.45-1,1v13c0,0.55,0.45,1,1,1h5c0.55,0,1-0.45,1-1V25z" fill="#FFFFFF"/></g><g><path d="M66.669,25c0-0.55-0.45-1-1-1h-5c-0.55,0-1,0.45-1,1v13c0,0.55,0.45,1,1,1h5c0.55,0,1-0.45,1-1V25z" fill="#FFFFFF"/></g><g><path d="M80.669,25c0-0.55-0.449-1-1-1h-5c-0.549,0-1,0.45-1,1v13c0,0.55,0.451,1,1,1h5c0.551,0,1-0.45,1-1V25z" fill="#FFFFFF"/></g></g><path d="M32.67,59.837c-0.55,0-1.272,0.358-1.604,0.797l-1.823,2.406c-0.332,0.438-1.054,0.797-1.604,0.797H21.67  c-0.55,0-1,0.449-1,1v5c0,0.549,0.45,1,1,1h6c0.55,0,1.27-0.359,1.6-0.801l1.8-2.4c0.33-0.439,1.05-0.799,1.6-0.799h5  c0.55,0,1-0.451,1-1v-5c0-0.55-0.45-1-1-1H32.67z" fill="#FFFFFF"/><path d="M32.67,73.9c-0.55,0-1.272,0.357-1.604,0.797l-1.823,2.406c-0.332,0.438-1.054,0.797-1.604,0.797H21.67  c-0.55,0-1,0.449-1,1v5c0,0.549,0.45,1,1,1h6c0.55,0,1.27-0.359,1.6-0.801l1.8-2.4c0.33-0.439,1.05-0.799,1.6-0.799h5  c0.55,0,1-0.451,1-1v-5c0-0.551-0.45-1-1-1H32.67z" fill="#FFFFFF"/><g><g><g><path d="M52.67,89c0-0.549-0.45-1-1-1h-5c-0.55,0-1,0.451-1,1v14c0,0.551,0.45,1,1,1h5c0.55,0,1-0.449,1-1V89z" fill="#FFFFFF"/></g><g><path d="M66.669,89c0-0.549-0.45-1-1-1h-5c-0.55,0-1,0.451-1,1v14c0,0.551,0.45,1,1,1h5c0.55,0,1-0.449,1-1V89z" fill="#FFFFFF"/></g><g><path d="M80.669,89c0-0.549-0.449-1-1-1h-5c-0.549,0-1,0.451-1,1v14c0,0.551,0.451,1,1,1h5c0.551,0,1-0.449,1-1     V89z" fill="#FFFFFF"/></g></g><path d="M94.669,45.962c0.551,0,1.272,0.358,1.604,0.797l1.823,2.407c0.332,0.438,1.055,0.796,1.604,0.796h5.969   c0.551,0,1,0.45,1,1v5c0,0.55-0.449,1-1,1h-6c-0.549,0-1.27-0.36-1.6-0.8l-1.8-2.4c-0.33-0.439-1.05-0.8-1.601-0.8h-5   c-0.549,0-1-0.45-1-1v-5c0-0.55,0.451-1,1-1H94.669z" fill="#FFFFFF"/><path d="M94.669,59.837c0.551,0,1.272,0.358,1.604,0.797l1.823,2.406c0.332,0.438,1.055,0.797,1.604,0.797h5.969   c0.551,0,1,0.449,1,1v5c0,0.549-0.449,1-1,1h-6c-0.549,0-1.27-0.361-1.6-0.801l-1.8-2.4c-0.33-0.439-1.05-0.799-1.601-0.799h-5   c-0.549,0-1-0.451-1-1v-5c0-0.55,0.451-1,1-1H94.669z" fill="#FFFFFF"/><path d="M94.669,73.9c0.551,0,1.272,0.357,1.604,0.797l1.823,2.406c0.332,0.438,1.055,0.797,1.604,0.797h5.969   c0.551,0,1,0.449,1,1v5c0,0.549-0.449,1-1,1h-6c-0.549,0-1.27-0.361-1.6-0.801l-1.8-2.4c-0.33-0.439-1.05-0.799-1.601-0.799h-5   c-0.549,0-1-0.451-1-1v-5c0-0.551,0.451-1,1-1H94.669z" fill="#FFFFFF"/></g><path d="M90.669,41v46c0,2.201-1.799,4-4,4h-46c-2.2,0-4-1.799-4-4V41c0-2.2,1.8-4,4-4h46  C88.871,37,90.669,38.8,90.669,41z" fill="#686868"/><path d="M82.892,48.444c0,0.55-0.451,1-1,1H66.765c-0.549,0-1-0.45-1-1v-3.137c0-0.55,0.45-1,1-1h15.127  c0.549,0,1,0.45,1,1V48.444z" fill="#828282"/></svg>
\ No newline at end of file

diff --git a/res/icon.rc b/res/icon.rc
new file mode 100644 (file)
index 0000000..854bd4c
--- /dev/null
+++ b/res/icon.rc
@@ -0,0 +1 @@
+0 ICON cpuminer.ico

diff --git a/res/resource.h b/res/resource.h
new file mode 100644 (file)
index 0000000..0e45227
Binary files /dev/null and b/res/resource.h differ