GOSTSec
/
cpuminer-gostd
mirror of https://github.com/GOSTSec/cpuminer-gostd
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

some modifications for windows static building

windows
R4SAS 6 years ago
parent
12224ad8d8
commit
280abe7938
5 changed files with 23 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      Makefile.am
  2. 3
      compat.h
  3. 3
      cpu-miner.c
  4. 8
      cpuminer-config.h
  5. 3
      m4/libcurl.m4

26
Makefile.am
Unescape View File

@ -1,4 +1,3 @@
if WANT_JANSSON if WANT_JANSSON
JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson
else else
@ -6,23 +5,26 @@ JANSSON_INCLUDES=
endif endif
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = example-cfg.json nomacro.pl EXTRA_DIST = example-cfg.json nomacro.pl
SUBDIRS = compat SUBDIRS = compat
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)
bin_PROGRAMS = minerd bin_PROGRAMS = minerd
minerd_SOURCES = elist.h miner.h compat.h \ minerd_SOURCES = elist.h miner.h compat.h \
cpu-miner.c util.c \ cpu-miner.c util.c \
sha2.c sha2-arm.S sha2-x86.S sha2-x64.S \ sha2.c sha2-arm.S sha2-x86.S sha2-x64.S \
scrypt.c scrypt-arm.S scrypt-x86.S scrypt-x64.S \ scrypt.c scrypt-arm.S scrypt-x86.S scrypt-x64.S \
blake.c bmw.c groestl.c jh.c keccak.c skein.c \ blake.c bmw.c groestl.c jh.c keccak.c skein.c \
aes_helper.c cubehash.c shavite.c simd.c echo.c luffa.c\ aes_helper.c cubehash.c shavite.c simd.c echo.c luffa.c\
quark.c gost.c Xcoin.c quark.c gost.c Xcoin.c
minerd_LDFLAGS = $(PTHREAD_FLAGS)
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@ # Linux (default)
#minerd_LDFLAGS = $(PTHREAD_FLAGS)
# Windows
minerd_LDFLAGS = $(PTHREAD_FLAGS) -Wl,-Bstatic -static-libgcc
minerd_DEFS = -DCURL_STATICLIB -DWIN32 -DWIN32_LEAN_AND_MEAN
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @WS2_LIBS@
minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@ minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@

3
compat.h
Unescape View File

@ -5,10 +5,11 @@
#include <windows.h> #include <windows.h>
static inline void sleep(int secs) /* static inline void sleep(int secs)
{ {
Sleep(secs * 1000); Sleep(secs * 1000);
} }
*/
enum { enum {
PRIO_PROCESS = 0, PRIO_PROCESS = 0,

3
cpu-miner.c
Unescape View File

@ -172,10 +172,11 @@ static char const usage[] = "\
Usage: " PROGRAM_NAME " [OPTIONS]\n\ Usage: " PROGRAM_NAME " [OPTIONS]\n\
Options:\n\ Options:\n\
-a, --algo=ALGO specify the algorithm to use\n\ -a, --algo=ALGO specify the algorithm to use\n\
gostd GOSTcoin\n\
scrypt scrypt(1024, 1, 1) (default)\n\ scrypt scrypt(1024, 1, 1) (default)\n\
sha256d SHA-256d\n\ sha256d SHA-256d\n\
quark Quarkcoin\n\ quark Quarkcoin\n\
X11 Xcoin\n\ X11 Xcoin\n\
-o, --url=URL URL of mining server (default: " DEF_RPC_URL ")\n\ -o, --url=URL URL of mining server (default: " DEF_RPC_URL ")\n\
-O, --userpass=U:P username:password pair for mining server\n\ -O, --userpass=U:P username:password pair for mining server\n\
-u, --user=USERNAME username for mining server\n\ -u, --user=USERNAME username for mining server\n\

8
cpuminer-config.h
Unescape View File

@ -14,7 +14,7 @@
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). /* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
*/ */
#define HAVE_ALLOCA_H 1 /* #undef HAVE_ALLOCA_H */
/* Define to 1 if you have the declaration of `be32dec', and to 0 if you /* Define to 1 if you have the declaration of `be32dec', and to 0 if you
don't. */ don't. */
@ -57,7 +57,7 @@
#define HAVE_STRING_H 1 #define HAVE_STRING_H 1
/* Define to 1 if you have the <syslog.h> header file. */ /* Define to 1 if you have the <syslog.h> header file. */
#define HAVE_SYSLOG_H 1 /* #undef HAVE_SYSLOG_H */
/* Define to 1 if you have the <sys/endian.h> header file. */ /* Define to 1 if you have the <sys/endian.h> header file. */
/* #undef HAVE_SYS_ENDIAN_H */ /* #undef HAVE_SYS_ENDIAN_H */
@ -69,7 +69,7 @@
#define HAVE_SYS_STAT_H 1 #define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/sysctl.h> header file. */ /* Define to 1 if you have the <sys/sysctl.h> header file. */
#define HAVE_SYS_SYSCTL_H 1 /* #undef HAVE_SYS_SYSCTL_H */
/* Define to 1 if you have the <sys/types.h> header file. */ /* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1 #define HAVE_SYS_TYPES_H 1
@ -81,7 +81,7 @@
#define LIBCURL_FEATURE_ASYNCHDNS 1 #define LIBCURL_FEATURE_ASYNCHDNS 1
/* Defined if libcurl supports IDN */ /* Defined if libcurl supports IDN */
#define LIBCURL_FEATURE_IDN 1 /* #undef LIBCURL_FEATURE_IDN */
/* Defined if libcurl supports IPv6 */ /* Defined if libcurl supports IPv6 */
#define LIBCURL_FEATURE_IPV6 1 #define LIBCURL_FEATURE_IPV6 1

3
m4/libcurl.m4
Unescape View File

@ -73,7 +73,6 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
_libcurl_try_link=yes _libcurl_try_link=yes
if test -d "$_libcurl_with" ; then if test -d "$_libcurl_with" ; then
LIBCURL_CPPFLAGS="-I$withval/include"
_libcurl_ldflags="-L$withval/lib" _libcurl_ldflags="-L$withval/lib"
AC_PATH_PROG([_libcurl_config],[curl-config],[], AC_PATH_PROG([_libcurl_config],[curl-config],[],
["$withval/bin"]) ["$withval/bin"])
@ -106,7 +105,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
LIBCURL_CPPFLAGS=`$_libcurl_config --cflags` LIBCURL_CPPFLAGS=`$_libcurl_config --cflags`
fi fi
if test x"$LIBCURL" = "x" ; then if test x"$LIBCURL" = "x" ; then
LIBCURL=`$_libcurl_config --libs` LIBCURL=`$_libcurl_config --static-libs`
# This is so silly, but Apple actually has a bug in their # This is so silly, but Apple actually has a bug in their
# curl-config script. Fixed in Tiger, but there are still # curl-config script. Fixed in Tiger, but there are still

Write Preview
Loading…
Cancel
Save