From e5779e1e268f5fdc417af56ab5687b20f06c8931 Mon Sep 17 00:00:00 2001
From: Jan Berdajs <mrbrdo@gmail.com>
Date: Sun, 8 Jun 2014 03:17:29 +0200
Subject: [PATCH] move algorithms into separate folder

---
 Makefile.am                                   | 29 +++++-----
 algorithm.c                                   | 26 ++++-----
 animecoin.c => algorithm/animecoin.c          |  0
 animecoin.h => algorithm/animecoin.h          |  0
 darkcoin.c => algorithm/darkcoin.c            |  0
 darkcoin.h => algorithm/darkcoin.h            |  0
 fuguecoin.c => algorithm/fuguecoin.c          |  0
 fuguecoin.h => algorithm/fuguecoin.h          |  0
 groestlcoin.c => algorithm/groestlcoin.c      |  0
 groestlcoin.h => algorithm/groestlcoin.h      |  0
 inkcoin.c => algorithm/inkcoin.c              |  0
 inkcoin.h => algorithm/inkcoin.h              |  0
 marucoin.c => algorithm/marucoin.c            |  0
 marucoin.h => algorithm/marucoin.h            |  0
 maxcoin.c => algorithm/maxcoin.c              |  0
 maxcoin.h => algorithm/maxcoin.h              |  0
 .../myriadcoin-groestl.c                      |  0
 .../myriadcoin-groestl.h                      |  0
 quarkcoin.c => algorithm/quarkcoin.c          |  0
 quarkcoin.h => algorithm/quarkcoin.h          |  0
 qubitcoin.c => algorithm/qubitcoin.c          |  0
 qubitcoin.h => algorithm/qubitcoin.h          |  0
 scrypt.c => algorithm/scrypt.c                |  0
 scrypt.h => algorithm/scrypt.h                |  0
 sifcoin.c => algorithm/sifcoin.c              |  0
 sifcoin.h => algorithm/sifcoin.h              |  0
 twecoin.c => algorithm/twecoin.c              |  0
 twecoin.h => algorithm/twecoin.h              |  0
 findnonce.c                                   |  2 +-
 winbuild/sgminer.vcxproj                      | 54 +++++++++----------
 winbuild/sgminer.vcxproj.filters              |  4 +-
 31 files changed, 58 insertions(+), 57 deletions(-)
 rename animecoin.c => algorithm/animecoin.c (100%)
 rename animecoin.h => algorithm/animecoin.h (100%)
 rename darkcoin.c => algorithm/darkcoin.c (100%)
 rename darkcoin.h => algorithm/darkcoin.h (100%)
 rename fuguecoin.c => algorithm/fuguecoin.c (100%)
 rename fuguecoin.h => algorithm/fuguecoin.h (100%)
 rename groestlcoin.c => algorithm/groestlcoin.c (100%)
 rename groestlcoin.h => algorithm/groestlcoin.h (100%)
 rename inkcoin.c => algorithm/inkcoin.c (100%)
 rename inkcoin.h => algorithm/inkcoin.h (100%)
 rename marucoin.c => algorithm/marucoin.c (100%)
 rename marucoin.h => algorithm/marucoin.h (100%)
 rename maxcoin.c => algorithm/maxcoin.c (100%)
 rename maxcoin.h => algorithm/maxcoin.h (100%)
 rename myriadcoin-groestl.c => algorithm/myriadcoin-groestl.c (100%)
 rename myriadcoin-groestl.h => algorithm/myriadcoin-groestl.h (100%)
 rename quarkcoin.c => algorithm/quarkcoin.c (100%)
 rename quarkcoin.h => algorithm/quarkcoin.h (100%)
 rename qubitcoin.c => algorithm/qubitcoin.c (100%)
 rename qubitcoin.h => algorithm/qubitcoin.h (100%)
 rename scrypt.c => algorithm/scrypt.c (100%)
 rename scrypt.h => algorithm/scrypt.h (100%)
 rename sifcoin.c => algorithm/sifcoin.c (100%)
 rename sifcoin.h => algorithm/sifcoin.h (100%)
 rename twecoin.c => algorithm/twecoin.c (100%)
 rename twecoin.h => algorithm/twecoin.h (100%)

diff --git a/Makefile.am b/Makefile.am
index d213b5fc..afa8c0b8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,23 +43,24 @@ sgminer_SOURCES += findnonce.c findnonce.h
 sgminer_SOURCES += adl.c adl.h adl_functions.h
 sgminer_SOURCES += pool.c pool.h
 sgminer_SOURCES += algorithm.c algorithm.h
-sgminer_SOURCES += scrypt.c scrypt.h
-sgminer_SOURCES += darkcoin.c darkcoin.h
-sgminer_SOURCES += qubitcoin.c qubitcoin.h
-sgminer_SOURCES += quarkcoin.c quarkcoin.h
-sgminer_SOURCES += myriadcoin-groestl.c myriadcoin-groestl.h
-sgminer_SOURCES += fuguecoin.c fuguecoin.h
-sgminer_SOURCES += inkcoin.c inkcoin.h
-sgminer_SOURCES += animecoin.c animecoin.h
-sgminer_SOURCES += groestlcoin.c groestlcoin.h
-sgminer_SOURCES += sifcoin.c sifcoin.h
-sgminer_SOURCES += twecoin.c twecoin.h
-sgminer_SOURCES += marucoin.c marucoin.h
-sgminer_SOURCES += maxcoin.c maxcoin.h
-sgminer_SOURCES += kernel/*.cl
 sgminer_SOURCES += ocl/patch_kernel.c ocl/patch_kernel.h
 sgminer_SOURCES += ocl/build_kernel.c ocl/build_kernel.h
 sgminer_SOURCES += ocl/binary_kernel.c ocl/binary_kernel.h
 
+sgminer_SOURCES += kernel/*.cl
+sgminer_SOURCES += algorithm/scrypt.c algorithm/scrypt.h
+sgminer_SOURCES += algorithm/darkcoin.c algorithm/darkcoin.h
+sgminer_SOURCES += algorithm/qubitcoin.c algorithm/qubitcoin.h
+sgminer_SOURCES += algorithm/quarkcoin.c algorithm/quarkcoin.h
+sgminer_SOURCES += algorithm/myriadcoin-groestl.c algorithm/myriadcoin-groestl.h
+sgminer_SOURCES += algorithm/fuguecoin.c algorithm/fuguecoin.h
+sgminer_SOURCES += algorithm/inkcoin.c algorithm/inkcoin.h
+sgminer_SOURCES += algorithm/animecoin.c algorithm/animecoin.h
+sgminer_SOURCES += algorithm/groestlcoin.c algorithm/groestlcoin.h
+sgminer_SOURCES += algorithm/sifcoin.c algorithm/sifcoin.h
+sgminer_SOURCES += algorithm/twecoin.c algorithm/twecoin.h
+sgminer_SOURCES += algorithm/marucoin.c algorithm/marucoin.h
+sgminer_SOURCES += algorithm/maxcoin.c algorithm/maxcoin.h
+
 bin_SCRIPTS	= $(top_srcdir)/kernel/*.cl
 
diff --git a/algorithm.c b/algorithm.c
index 2138d0c7..53c2fff0 100644
--- a/algorithm.c
+++ b/algorithm.c
@@ -11,19 +11,19 @@
 #include "sha2.h"
 #include "ocl.h"
 
-#include "scrypt.h"
-#include "animecoin.h"
-#include "inkcoin.h"
-#include "quarkcoin.h"
-#include "qubitcoin.h"
-#include "sifcoin.h"
-#include "darkcoin.h"
-#include "myriadcoin-groestl.h"
-#include "fuguecoin.h"
-#include "groestlcoin.h"
-#include "twecoin.h"
-#include "marucoin.h"
-#include "maxcoin.h"
+#include "algorithm/scrypt.h"
+#include "algorithm/animecoin.h"
+#include "algorithm/inkcoin.h"
+#include "algorithm/quarkcoin.h"
+#include "algorithm/qubitcoin.h"
+#include "algorithm/sifcoin.h"
+#include "algorithm/darkcoin.h"
+#include "algorithm/myriadcoin-groestl.h"
+#include "algorithm/fuguecoin.h"
+#include "algorithm/groestlcoin.h"
+#include "algorithm/twecoin.h"
+#include "algorithm/marucoin.h"
+#include "algorithm/maxcoin.h"
 
 #include "compat.h"
 
diff --git a/animecoin.c b/algorithm/animecoin.c
similarity index 100%
rename from animecoin.c
rename to algorithm/animecoin.c
diff --git a/animecoin.h b/algorithm/animecoin.h
similarity index 100%
rename from animecoin.h
rename to algorithm/animecoin.h
diff --git a/darkcoin.c b/algorithm/darkcoin.c
similarity index 100%
rename from darkcoin.c
rename to algorithm/darkcoin.c
diff --git a/darkcoin.h b/algorithm/darkcoin.h
similarity index 100%
rename from darkcoin.h
rename to algorithm/darkcoin.h
diff --git a/fuguecoin.c b/algorithm/fuguecoin.c
similarity index 100%
rename from fuguecoin.c
rename to algorithm/fuguecoin.c
diff --git a/fuguecoin.h b/algorithm/fuguecoin.h
similarity index 100%
rename from fuguecoin.h
rename to algorithm/fuguecoin.h
diff --git a/groestlcoin.c b/algorithm/groestlcoin.c
similarity index 100%
rename from groestlcoin.c
rename to algorithm/groestlcoin.c
diff --git a/groestlcoin.h b/algorithm/groestlcoin.h
similarity index 100%
rename from groestlcoin.h
rename to algorithm/groestlcoin.h
diff --git a/inkcoin.c b/algorithm/inkcoin.c
similarity index 100%
rename from inkcoin.c
rename to algorithm/inkcoin.c
diff --git a/inkcoin.h b/algorithm/inkcoin.h
similarity index 100%
rename from inkcoin.h
rename to algorithm/inkcoin.h
diff --git a/marucoin.c b/algorithm/marucoin.c
similarity index 100%
rename from marucoin.c
rename to algorithm/marucoin.c
diff --git a/marucoin.h b/algorithm/marucoin.h
similarity index 100%
rename from marucoin.h
rename to algorithm/marucoin.h
diff --git a/maxcoin.c b/algorithm/maxcoin.c
similarity index 100%
rename from maxcoin.c
rename to algorithm/maxcoin.c
diff --git a/maxcoin.h b/algorithm/maxcoin.h
similarity index 100%
rename from maxcoin.h
rename to algorithm/maxcoin.h
diff --git a/myriadcoin-groestl.c b/algorithm/myriadcoin-groestl.c
similarity index 100%
rename from myriadcoin-groestl.c
rename to algorithm/myriadcoin-groestl.c
diff --git a/myriadcoin-groestl.h b/algorithm/myriadcoin-groestl.h
similarity index 100%
rename from myriadcoin-groestl.h
rename to algorithm/myriadcoin-groestl.h
diff --git a/quarkcoin.c b/algorithm/quarkcoin.c
similarity index 100%
rename from quarkcoin.c
rename to algorithm/quarkcoin.c
diff --git a/quarkcoin.h b/algorithm/quarkcoin.h
similarity index 100%
rename from quarkcoin.h
rename to algorithm/quarkcoin.h
diff --git a/qubitcoin.c b/algorithm/qubitcoin.c
similarity index 100%
rename from qubitcoin.c
rename to algorithm/qubitcoin.c
diff --git a/qubitcoin.h b/algorithm/qubitcoin.h
similarity index 100%
rename from qubitcoin.h
rename to algorithm/qubitcoin.h
diff --git a/scrypt.c b/algorithm/scrypt.c
similarity index 100%
rename from scrypt.c
rename to algorithm/scrypt.c
diff --git a/scrypt.h b/algorithm/scrypt.h
similarity index 100%
rename from scrypt.h
rename to algorithm/scrypt.h
diff --git a/sifcoin.c b/algorithm/sifcoin.c
similarity index 100%
rename from sifcoin.c
rename to algorithm/sifcoin.c
diff --git a/sifcoin.h b/algorithm/sifcoin.h
similarity index 100%
rename from sifcoin.h
rename to algorithm/sifcoin.h
diff --git a/twecoin.c b/algorithm/twecoin.c
similarity index 100%
rename from twecoin.c
rename to algorithm/twecoin.c
diff --git a/twecoin.h b/algorithm/twecoin.h
similarity index 100%
rename from twecoin.h
rename to algorithm/twecoin.h
diff --git a/findnonce.c b/findnonce.c
index 0925fb16..c114f55a 100644
--- a/findnonce.c
+++ b/findnonce.c
@@ -15,7 +15,7 @@
 #include <string.h>
 
 #include "findnonce.h"
-#include "scrypt.h"
+#include "algorithm/scrypt.h"
 
 const uint32_t SHA256_K[64] = {
 	0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5,
diff --git a/winbuild/sgminer.vcxproj b/winbuild/sgminer.vcxproj
index 39ec0c95..311e14ed 100644
--- a/winbuild/sgminer.vcxproj
+++ b/winbuild/sgminer.vcxproj
@@ -254,7 +254,7 @@
   <ItemGroup>
     <ClCompile Include="..\adl.c" />
     <ClCompile Include="..\algorithm.c" />
-    <ClCompile Include="..\animecoin.c" />
+    <ClCompile Include="..\algorithm\animecoin.c" />
     <ClCompile Include="..\api.c" />
     <ClCompile Include="..\ccan\opt\helpers.c" />
     <ClCompile Include="..\ccan\opt\opt.c" />
@@ -270,25 +270,25 @@
     <ClCompile Include="..\compat\jansson-2.5\src\strconv.c" />
     <ClCompile Include="..\compat\jansson-2.5\src\utf.c" />
     <ClCompile Include="..\compat\jansson-2.5\src\value.c" />
-    <ClCompile Include="..\darkcoin.c" />
+    <ClCompile Include="..\algorithm\darkcoin.c" />
     <ClCompile Include="..\driver-opencl.c" />
     <ClCompile Include="..\findnonce.c" />
-    <ClCompile Include="..\fuguecoin.c" />
-    <ClCompile Include="..\groestlcoin.c" />
+    <ClCompile Include="..\algorithm\fuguecoin.c" />
+    <ClCompile Include="..\algorithm\groestlcoin.c" />
     <ClCompile Include="..\hexdump.c" />
-    <ClCompile Include="..\inkcoin.c" />
+    <ClCompile Include="..\algorithm\inkcoin.c" />
     <ClCompile Include="..\logging.c" />
-    <ClCompile Include="..\marucoin.c" />
-    <ClCompile Include="..\maxcoin.c" />
-    <ClCompile Include="..\myriadcoin-groestl.c" />
+    <ClCompile Include="..\algorithm\marucoin.c" />
+    <ClCompile Include="..\algorithm\maxcoin.c" />
+    <ClCompile Include="..\algorithm\myriadcoin-groestl.c" />
     <ClCompile Include="..\ocl.c" />
     <ClCompile Include="..\pool.c" />
-    <ClCompile Include="..\quarkcoin.c" />
-    <ClCompile Include="..\qubitcoin.c" />
-    <ClCompile Include="..\scrypt.c" />
+    <ClCompile Include="..\algorithm\quarkcoin.c" />
+    <ClCompile Include="..\algorithm\qubitcoin.c" />
+    <ClCompile Include="..\algorithm\scrypt.c" />
     <ClCompile Include="..\sgminer.c" />
     <ClCompile Include="..\sha2.c" />
-    <ClCompile Include="..\sifcoin.c" />
+    <ClCompile Include="..\algorithm\sifcoin.c" />
     <ClCompile Include="..\sph\aes_helper.c" />
     <ClCompile Include="..\sph\blake.c" />
     <ClCompile Include="..\sph\bmw.c" />
@@ -307,13 +307,13 @@
     <ClCompile Include="..\sph\shavite.c" />
     <ClCompile Include="..\sph\simd.c" />
     <ClCompile Include="..\sph\skein.c" />
-    <ClCompile Include="..\twecoin.c" />
+    <ClCompile Include="..\algorithm\twecoin.c" />
     <ClCompile Include="..\util.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\adl.h" />
     <ClInclude Include="..\algorithm.h" />
-    <ClInclude Include="..\animecoin.h" />
+    <ClInclude Include="..\algorithm\animecoin.h" />
     <ClInclude Include="..\arg-nonnull.h" />
     <ClInclude Include="..\bench_block.h" />
     <ClInclude Include="..\c++defs.h" />
@@ -323,25 +323,25 @@
     <ClInclude Include="..\compat\jansson-2.5\src\jansson_private.h" />
     <ClInclude Include="..\compat\jansson-2.5\src\strbuffer.h" />
     <ClInclude Include="..\compat\jansson-2.5\src\utf.h" />
-    <ClInclude Include="..\darkcoin.h" />
+    <ClInclude Include="..\algorithm\darkcoin.h" />
     <ClInclude Include="..\driver-opencl.h" />
     <ClInclude Include="..\elist.h" />
     <ClInclude Include="..\findnonce.h" />
-    <ClInclude Include="..\fuguecoin.h" />
-    <ClInclude Include="..\groestlcoin.h" />
-    <ClInclude Include="..\inkcoin.h" />
+    <ClInclude Include="..\algorithm\fuguecoin.h" />
+    <ClInclude Include="..\algorithm\groestlcoin.h" />
+    <ClInclude Include="..\algorithm\inkcoin.h" />
     <ClInclude Include="..\logging.h" />
-    <ClInclude Include="..\marucoin.h" />
-    <ClInclude Include="..\maxcoin.h" />
+    <ClInclude Include="..\algorithm\marucoin.h" />
+    <ClInclude Include="..\algorithm\maxcoin.h" />
     <ClInclude Include="..\miner.h" />
-    <ClInclude Include="..\myriadcoin-groestl.h" />
+    <ClInclude Include="..\algorithm\myriadcoin-groestl.h" />
     <ClInclude Include="..\ocl.h" />
     <ClInclude Include="..\pool.h" />
-    <ClInclude Include="..\quarkcoin.h" />
-    <ClInclude Include="..\qubitcoin.h" />
-    <ClInclude Include="..\scrypt.h" />
+    <ClInclude Include="..\algorithm\quarkcoin.h" />
+    <ClInclude Include="..\algorithm\qubitcoin.h" />
+    <ClInclude Include="..\algorithm\scrypt.h" />
     <ClInclude Include="..\sha2.h" />
-    <ClInclude Include="..\sifcoin.h" />
+    <ClInclude Include="..\algorithm\sifcoin.h" />
     <ClInclude Include="..\sph\sph_blake.h" />
     <ClInclude Include="..\sph\sph_bmw.h" />
     <ClInclude Include="..\sph\sph_cubehash.h" />
@@ -358,7 +358,7 @@
     <ClInclude Include="..\sph\sph_simd.h" />
     <ClInclude Include="..\sph\sph_skein.h" />
     <ClInclude Include="..\sph\sph_types.h" />
-    <ClInclude Include="..\twecoin.h" />
+    <ClInclude Include="..\algorithm\twecoin.h" />
     <ClInclude Include="..\uthash.h" />
     <ClInclude Include="..\util.h" />
     <ClInclude Include="..\warn-on-use.h" />
@@ -371,4 +371,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/winbuild/sgminer.vcxproj.filters b/winbuild/sgminer.vcxproj.filters
index ac38c5fe..5816df0b 100644
--- a/winbuild/sgminer.vcxproj.filters
+++ b/winbuild/sgminer.vcxproj.filters
@@ -229,7 +229,7 @@
     <ClInclude Include="..\ocl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\scrypt.h">
+    <ClInclude Include="..\algorithm\scrypt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\sha2.h">
@@ -359,4 +359,4 @@
   <ItemGroup>
     <None Include="README.txt" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>