rename cpuminer-config.h to cpuminer-config-win.h and increase versio…

…n number
KlausT · Feb 12, 2018 · 1ff4081 · 1ff4081
1 parent 08ae683
commit 1ff4081
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -15,19 +15,7 @@ Don't forget to support the original ccminer authors
 Christian Buchner and Christian H. This mod would not be
 here without their work on ccminer:
 
-* LTC donation address: LKS1WDKGED647msBQfLBHV3Ls8sveGncnm
 * BTC donation address: 16hJF5mceSojnTD3ZTUDqdRhDyPJzoRakM
-* YAC donation address: Y87sptDEcpLkLeAuex6qZioDbvy1qXZEj4
-* VTC donation address: VrjeFzMgvteCGarLw85KivBzmsiH9fqp4a
-* MAX donation address: mHrhQP9EFArechWxTFJ97s9D3jvcCvEEnt
-* DOGE donation address: DT9ghsGmez6ojVdEZgvaZbT2Z3TruXG6yP
-* HVC donation address: HNN3PyyTMkDo4RkEjkWSGMwqia1yD8mwJN
-* GRS donation address: FmJKJAhvyHWPeEVeLQHefr2naqgWc9ABTM
-* MYR donation address: MNHM7Q7HVfGpKDJgVJrY8ofwvmeugNewyf
-* JPC donation address: JYFBypVDkk583yKWY4M46TG5vXG8hfgD2U
-* SFR donation address: SR4b87aEnPfTs77bo9NnnaV21fiF6jQpAp
-* MNC donation address: MShgNUSYwybEbXLvJUtdNg1a7rUeiNgooK
-* BTQ donation address: 13GFwLiZL2DaA9XeE733PNrQX5QYLFsonS
 
 ## Introduction
 

diff --git a/README.txt b/README.txt
@@ -9,29 +9,13 @@ KlausT's BTC donation address: 1QDwdLPrPYSoPqS7pB2kGG84YX6hEcQ4JN
 KlausT's BCH donation address: 1AH1u7B4KtDTUBgmT6NrXyahNEgTac3fL7
 
 tsiv's BTC donation address: 1JHDKp59t1RhHFXsTw2UQpR3F9BBz3R3cs
-tsiv's DRK donation address: XrHp267JNTVdw5P3dsBpqYfgTpWnzoESPQ
-tsiv's JPC donation address: Jb9hFeBgakCXvM5u27rTZoYR9j13JGmuc2
-tsiv's VTC donation address: VwYsZFPb6KMeWuP4voiS9H1kqxcU9kGbsw
-tsiv's XMR donation address: 
-42uasNqYPnSaG3TwRtTeVbQ4aRY3n9jY6VXX3mfgerWt4ohDQLVaBPv3cYGKDXasTUVuLvhxetcuS16ynt85czQ48mbSrWX
+tsiv's XMR donation address: 42uasNqYPnSaG3TwRtTeVbQ4aRY3n9jY6VXX3mfgerWt4ohDQLVaBPv3cYGKDXasTUVuLvhxetcuS16ynt85czQ48mbSrWX
 
 Don't forget to support the original ccminer authors
 Christian Buchner and Christian H. This mod would not be
 here without their work on ccminer:
 
-   LTC donation address: LKS1WDKGED647msBQfLBHV3Ls8sveGncnm
    BTC donation address: 16hJF5mceSojnTD3ZTUDqdRhDyPJzoRakM
-   YAC donation address: Y87sptDEcpLkLeAuex6qZioDbvy1qXZEj4
-   VTC donation address: VrjeFzMgvteCGarLw85KivBzmsiH9fqp4a
-   MAX donation address: mHrhQP9EFArechWxTFJ97s9D3jvcCvEEnt
-  DOGE donation address: DT9ghsGmez6ojVdEZgvaZbT2Z3TruXG6yP
-   HVC donation address: HNN3PyyTMkDo4RkEjkWSGMwqia1yD8mwJN
-   GRS donation address: FmJKJAhvyHWPeEVeLQHefr2naqgWc9ABTM
-   MYR donation address: MNHM7Q7HVfGpKDJgVJrY8ofwvmeugNewyf
-   JPC donation address: JYFBypVDkk583yKWY4M46TG5vXG8hfgD2U
-   SFR donation address: SR4b87aEnPfTs77bo9NnnaV21fiF6jQpAp
-   MNC donation address: MShgNUSYwybEbXLvJUtdNg1a7rUeiNgooK
-   BTQ donation address: 13GFwLiZL2DaA9XeE733PNrQX5QYLFsonS
 ***************************************************************
 
 >>> Introduction <<<

diff --git a/ccminer.vcxproj b/ccminer.vcxproj
@@ -300,7 +300,7 @@ copy "$(CudaToolkitBinDir)\cudart*.dll" "$(OutDir)"</Command>
     <ClInclude Include="compat\stdbool.h" />
     <ClInclude Include="compat\sys\time.h" />
     <ClInclude Include="compat\unistd.h" />
-    <ClInclude Include="cpuminer-config.h" />
+    <ClInclude Include="cpuminer-config-win.h" />
     <ClInclude Include="crypto\hash.h" />
     <ClInclude Include="cuda_helper.h" />
     <ClInclude Include="elist.h" />

diff --git a/ccminer.vcxproj.filters b/ccminer.vcxproj.filters
@@ -134,9 +134,6 @@
     <ClInclude Include="compat\stdbool.h">
       <Filter>Header Files\compat</Filter>
     </ClInclude>
-    <ClInclude Include="cpuminer-config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="cuda_helper.h">
       <Filter>Header Files\CUDA</Filter>
     </ClInclude>
@@ -200,6 +197,9 @@
     <ClInclude Include="compat\jansson\util.h">
       <Filter>Header Files\compat\jansson</Filter>
     </ClInclude>
+    <ClInclude Include="cpuminer-config-win.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CudaCompile Include="cryptonight\cuda_cryptonight_extra.cu">

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([ccminer-cryptonight], [2.06])
+AC_INIT([ccminer-cryptonight], [3.00])
 
 AC_PREREQ([2.59c])
 AC_CANONICAL_SYSTEM

diff --git a/cpu-miner.c b/cpu-miner.c
@@ -7,8 +7,11 @@
 * Software Foundation; either version 2 of the License, or (at your option)
 * any later version.  See COPYING for more details.
 */
-
+#ifdef WIN32
+#include "cpuminer-config-win.h"
+#else
 #include "cpuminer-config.h"
+#endif
 #define _GNU_SOURCE
 
 #include <stdio.h>
@@ -1893,7 +1896,7 @@ static int msver(void)
 	return version;
 }
 
-#define PROGRAM_VERSION "2.06"
+#define PROGRAM_VERSION "3.00"
 int main(int argc, char *argv[])
 {
 	struct thr_info *thr;

diff --git a/cpuminer-config.h → cpuminer-config-win.h b/cpuminer-config.h → cpuminer-config-win.h
@@ -1,8 +1,3 @@
-/* cpuminer-config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
 #undef CRAY_STACKSEG_END
 
 /* Define to 1 if using `alloca.c'. */
@@ -152,7 +147,7 @@
 #define PACKAGE_NAME "ccminer-cryptonight"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ccminer-cryptonight 2.06"
+#define PACKAGE_STRING "ccminer-cryptonight 3.00"
 
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
@@ -161,7 +156,7 @@
 #undef PACKAGE_URL
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "2.06"
+#define PACKAGE_VERSION "3.00"
 
 /* Version number of package */
 #undef VERSION

diff --git a/cryptonight.c b/cryptonight.c
@@ -4,7 +4,11 @@
 
 // Modified for CPUminer by Lucas Jones
 
+#ifdef WIN32
+#include "cpuminer-config-win.h"
+#else
 #include "cpuminer-config.h"
+#endif
 #include "miner.h"
 #include "crypto/oaes_lib.h"
 #include "crypto/c_keccak.h"

diff --git a/cryptonight/cryptonight.cu b/cryptonight/cryptonight.cu
@@ -7,7 +7,11 @@
 
 extern "C"
 {
+#ifdef WIN32
+#include "cpuminer-config-win.h"
+#else
 #include "cpuminer-config.h"
+#endif
 #include "miner.h"
 }
 #include "cryptonight.h"

diff --git a/miner.h b/miner.h
@@ -5,7 +5,11 @@
 extern "C" {
 #endif
 
+#ifdef WIN32
+#include "cpuminer-config-win.h"
+#else
 #include "cpuminer-config.h"
+#endif
 
 #include <stdbool.h>
 #include <inttypes.h>

diff --git a/sha2.c b/sha2.c
@@ -8,7 +8,11 @@
  * any later version.  See COPYING for more details.
  */
 
+#ifdef WIN32
+#include "cpuminer-config-win.h"
+#else
 #include "cpuminer-config.h"
+#endif
 #include "miner.h"
 
 #include <string.h>

diff --git a/util.c b/util.c
@@ -9,7 +9,11 @@
 */
 
 #define _GNU_SOURCE
+#ifdef WIN32
+#include "cpuminer-config-win.h"
+#else
 #include "cpuminer-config.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>