Browse Source

Rename code and application binary to cgminer version 1.0.9 preempting version 1.1.0, moving main code to main.c.

nfactor-troky
Con Kolivas 14 years ago
parent
commit
91f9c527ba
  1. 6
      .gitignore
  2. 4
      AUTHORS
  3. 14
      Makefile.am
  4. 2
      README
  5. 7
      configure.ac
  6. 6
      main.c

6
.gitignore vendored

@ -1,7 +1,9 @@
cgminer
cgminer.exe
minerd minerd
minerd.exe minerd.exe
*.o *.o
*.bin
autom4te.cache autom4te.cache
.deps .deps
@ -28,4 +30,4 @@ mingw32-config.cache
ext_deps ext_deps
config.h.in config.h.in
config.h config.h

4
AUTHORS

@ -1,2 +1,2 @@
Jeff Garzik <jgarzik@pobox.com> Original CPU mining software: Jeff Garzik <jgarzik@pobox.com>
Con Kolivas <kernel@kolivas.org> GPU mining and rewrite: Con Kolivas <kernel@kolivas.org> 15qSxP1SQcUX3o4nhkfdbgyoWEFMomJ4rZ

14
Makefile.am

@ -13,21 +13,21 @@ SUBDIRS = lib compat
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
bin_PROGRAMS = minerd bin_PROGRAMS = cgminer
minerd_SOURCES = elist.h miner.h compat.h \ cgminer_SOURCES = elist.h miner.h compat.h \
cpu-miner.c util.c \ main.c util.c \
ocl.c findnonce.c \ ocl.c findnonce.c \
sha256_generic.c sha256_4way.c sha256_via.c \ sha256_generic.c sha256_4way.c sha256_via.c \
sha256_cryptopp.c sha256_sse2_amd64.c sha256_cryptopp.c sha256_sse2_amd64.c
minerd_LDFLAGS = $(PTHREAD_FLAGS) cgminer_LDFLAGS = $(PTHREAD_FLAGS)
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ lib/libgnu.a cgminer_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ lib/libgnu.a
minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@ -I$(top_builddir)/lib -I$(top_srcdir)/lib cgminer_CPPFLAGS = @LIBCURL_CPPFLAGS@ -I$(top_builddir)/lib -I$(top_srcdir)/lib
if HAVE_x86_64 if HAVE_x86_64
if HAS_YASM if HAS_YASM
SUBDIRS += x86_64 SUBDIRS += x86_64
minerd_LDADD += x86_64/libx8664.a cgminer_LDADD += x86_64/libx8664.a
AM_CFLAGS = -DHAS_YASM AM_CFLAGS = -DHAS_YASM
endif endif
endif endif

2
README

@ -29,7 +29,7 @@ Native WIN32 build instructions (on mingw32, on windows):
CFLAGS="-O3 -Wall -msse2 -I<path to AMD APP include>" LDFLAGS="-L<path to AMD APP lib/x86>" ./configure CFLAGS="-O3 -Wall -msse2 -I<path to AMD APP include>" LDFLAGS="-L<path to AMD APP lib/x86>" ./configure
make make
Usage instructions: Run "minerd --help" to see options. Usage instructions: Run "cgminer --help" to see options.
Also many issues and FAQs are covered in the forum thread Also many issues and FAQs are covered in the forum thread
dedicated to this program, dedicated to this program,

7
configure.ac

@ -1,9 +1,9 @@
AC_INIT([cpuminer], [1.0.2]) AC_INIT([cgminer], [1.0.9])
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([cpu-miner.c]) AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign]) AM_INIT_AUTOMAKE([foreign])
@ -109,8 +109,7 @@ AM_CONDITIONAL([HAS_YASM], [test x$has_yasm = xtrue])
PKG_PROG_PKG_CONFIG() PKG_PROG_PKG_CONFIG()
LIBCURL_CHECK_CONFIG(, 7.10.1, , LIBCURL_CHECK_CONFIG(, 7.10.1, , [AC_MSG_ERROR([Missing required libcurl dev >= 7.10.1])])
[AC_MSG_ERROR([Missing required libcurl >= 7.10.1])])
AC_SUBST(OPENCL_LIBS) AC_SUBST(OPENCL_LIBS)
AC_SUBST(JANSSON_LIBS) AC_SUBST(JANSSON_LIBS)

6
cpu-miner.c → main.c

@ -31,7 +31,7 @@
#include "findnonce.h" #include "findnonce.h"
#include "ocl.h" #include "ocl.h"
#define PROGRAM_NAME "minerd" #define PROGRAM_NAME "cgminer"
#define DEF_RPC_URL "http://127.0.0.1:8332/" #define DEF_RPC_URL "http://127.0.0.1:8332/"
#define DEF_RPC_USERNAME "rpcuser" #define DEF_RPC_USERNAME "rpcuser"
#define DEF_RPC_PASSWORD "rpcpass" #define DEF_RPC_PASSWORD "rpcpass"
@ -1313,8 +1313,8 @@ static void show_usage(void)
{ {
int i; int i;
printf("minerd version %s\n\n", VERSION); printf("cgminer version %s\n\n", VERSION);
printf("Usage:\tminerd [options]\n\nSupported options:\n"); printf("Usage:\tcgminer [options]\n\nSupported options:\n");
for (i = 0; i < ARRAY_SIZE(options_help); i++) { for (i = 0; i < ARRAY_SIZE(options_help); i++) {
struct option_help *h; struct option_help *h;
Loading…
Cancel
Save