Skip to content

Commit

Permalink
Update m-minerd
Browse files Browse the repository at this point in the history
  • Loading branch information
joelao95 committed Oct 13, 2015
1 parent a45dcdf commit d908fd0
Show file tree
Hide file tree
Showing 11 changed files with 914 additions and 17 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ RUN cd cpuminer && ./configure CFLAGS="-O3"
RUN cd cpuminer && make

WORKDIR /cpuminer
ENTRYPOINT ["./minerdlegacy"]
ENTRYPOINT ["./m-minerd"]
370 changes: 370 additions & 0 deletions INSTALL

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ SUBDIRS = compat m7
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
INCLUDES += -I$(top_srcdir)/m7

bin_PROGRAMS = minerdlegacy
bin_PROGRAMS = m-minerd

dist_man_MANS = minerdlegacy.1
dist_man_MANS = m-minerd.1

minerdlegacy_SOURCES = elist.h miner.h compat.h \
m_minerd_SOURCES = elist.h miner.h compat.h \
cpu-miner.c util.c \
sha2.c scrypt.c m7mhash.c
if USE_ASM
if ARCH_x86
minerdlegacy_SOURCES += sha2-x86.S scrypt-x86.S
m_minerd_SOURCES += sha2-x86.S scrypt-x86.S
endif
if ARCH_x86_64
minerdlegacy_SOURCES += sha2-x64.S scrypt-x64.S
m_minerd_SOURCES += sha2-x64.S scrypt-x64.S
endif
if ARCH_ARM
minerdlegacy_SOURCES += sha2-arm.S scrypt-arm.S
m_minerd_SOURCES += sha2-arm.S scrypt-arm.S
endif
endif
minerdlegacy_LDFLAGS = $(PTHREAD_FLAGS) -flto -fuse-linker-plugin -Ofast
minerdlegacy_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @M7M_LIBS@ -lgmp -lcurl -lm
minerdlegacy_CPPFLAGS = -Im7 -Ofast -march=native -flto -fuse-linker-plugin
m_minerd_LDFLAGS = $(PTHREAD_FLAGS) -flto -fuse-linker-plugin -Ofast
m_minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ @M7M_LIBS@ -lgmp -lcurl -lm
m_minerd_CPPFLAGS = -Im7 -Ofast -march=native -flto -fuse-linker-plugin

8 changes: 4 additions & 4 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Architecture-specific notes:
doesn't support some instruction sets. In that case, the miner
can still be built, but unavailable optimizations are left off.

Usage instructions: Run "minerdlegacy --help" to see options.
Usage instructions: Run "m-minerd --help" to see options.

Connecting through a proxy: Use the --proxy option.
To use a SOCKS proxy, add a socks4:// or socks5:// prefix to the proxy host.
Expand All @@ -75,9 +75,9 @@ dedicated to this program,
https://bitcointalk.org/index.php?topic=55038.0

Solo mining:
./minerdlegacy --url http://127.0.0.1:RPCPORT/ --user RPCUSER --pass RPCPASSWORD --threads thread_numbers -e cpu_efficiency
./m-minerd --url http://127.0.0.1:RPCPORT/ --user RPCUSER --pass RPCPASSWORD --threads thread_numbers -e cpu_efficiency

Pool mining:
./minerdlegacy -o stratum+tcp://pool_url:pool_port -u pool_user.worker -p password -t thread_numbers -e cpu_efficiency
./m-minerd -o stratum+tcp://pool_url:pool_port -u pool_user.worker -p password -t thread_numbers -e cpu_efficiency

Scrypts: m-minerdlegacy.sh, m-minerdlegacy.bat; change rpcport, rpc user and pass accordinly.
Scrypts: m-minerd.sh, m-minerd.bat; change rpcport, rpc user and pass accordinly.
2 changes: 1 addition & 1 deletion cpu-miner.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "compat.h"
#include "miner.h"

#define PROGRAM_NAME "minerdlegacy"
#define PROGRAM_NAME "m-minerd"
#define LP_SCANTIME 60

#ifdef __linux /* Linux specific policy and affinity management */
Expand Down
Loading

0 comments on commit d908fd0

Please sign in to comment.