Noel Maersk
8079d054d6
Merge branch 'nfactor'
...
Conflicts (resolved):
Makefile.am
winbuild/sgminer.vcxproj.filters
2014-03-14 17:46:54 +02:00
Noel Maersk
776eec2e11
algorithm: initial structure definition.
2014-03-06 21:23:10 +02:00
Noel Maersk
8e4fb3c554
pool: abstract get_pool_name()
...
The introduction of get_pool_name() warrants a separate function
so opt_incognito does not litter everywhere.
2014-02-28 22:15:39 +02:00
Noel Maersk
f2f2bcedc7
build: use git version if available.
...
Borrowed from Arch Linux pacman:
https://projects.archlinux.org/pacman.git/tree/
2014-02-04 15:18:27 +02:00
Noel Maersk
9d1db95a28
misc: move scrypt130511.cl kernel file to kernel/ckolivas.cl
...
Prepare for more kernels. :)
Get rid of the kernel date, since this fudges up commit history.
Named after Con Kolivas, the most recent committer.
2014-01-20 16:04:43 +02:00
Noel Maersk
683abd0b17
build: fix warning + other small fixes.
2014-01-15 15:52:05 +02:00
Noel Maersk
5b977125fa
misc: Replace many (but not all) instances of 'cgminer' with 'sgminer'.
...
Just ran a `sed -i 's/cgminer/sgminer/'` on several files.
2014-01-15 15:36:19 +02:00
Con Kolivas
155945094f
Add to cgminer_CPPFLAGS instead of redefining them.
...
Conflicts:
Makefile.am
2014-01-15 13:54:14 +02:00
Noel Maersk
747d870d32
build: remove reference to a linux-usb-miner
2014-01-15 13:49:01 +02:00
Con Kolivas
d26fb09e7c
Replace deprecated use of INCLUDES with _CPPFLAGS.
...
Conflicts:
Makefile.am
2014-01-15 13:48:33 +02:00
Noel Maersk
dcb0111a22
Add all sources unconditionally in Makefile.am.
...
As in wolf's branch: cfac323a4f
2013-12-04 00:37:49 +02:00
Noel Maersk
95586f72f0
Squash-merge branch dead-end with unnecessary check removals.
2013-11-24 16:18:10 +02:00
Noel Maersk
d0070c0424
HARD RESET to: Remove Bitcoin detection code.
...
I'm pretty sure no one was working on this but me.
The code was unusable (gave 100% hardware errors) due to me not
testing it sufficiently. I hope this will not happen again.
ADL doesn't work for some reason, too.
2013-11-19 02:32:58 +02:00
Con Kolivas
c4542f2b96
Merge branch 'master' into hfa
...
Conflicts:
Makefile.am
api.c
configure.ac
miner.h
2013-10-31 12:29:59 +11:00
Vitalii Demianets
53570ae8a0
KnC driver: knc-spi-fpga ASIC driver
...
This driver talks to KnCMiner controller via SPI
Protocol specification is available at
https://github.com/KnCMiner/jupiter-hw-docs/blob/master/fpga_spi.md
2013-10-26 23:58:52 +02:00
Henrik Nordstrom
4bc955c004
Fixup jansson & libusb include paths when using separate build directory
2013-10-26 23:58:52 +02:00
Con Kolivas
5ea6a8eaa2
Merge branch 'master' into hashfast
...
Conflicts:
Makefile.am
2013-10-23 22:45:56 +11:00
Con Kolivas
e76421320e
Minor opencl build corrections.
2013-10-23 22:31:00 +11:00
Con Kolivas
9fa8e920c7
Modify Makefile to only include opencl related code when configured in.
2013-10-23 21:29:42 +11:00
Con Kolivas
f5baf9f57a
Merge branch 'master' into hashfast
...
Conflicts:
usbutils.h
2013-10-18 19:12:13 +11:00
Con Kolivas
d529a3fdbd
Initial import of jansson-2.5
2013-10-17 08:29:24 +11:00
Con Kolivas
e7a9aef65b
Add hf_protocol.h to cgminer sources.
2013-10-13 18:48:56 +11:00
Con Kolivas
9b5c534911
Merge branch 'master' into hashfast
...
Conflicts:
api.c
configure.ac
miner.h
usbutils.c
usbutils.h
2013-10-13 16:41:53 +11:00
ckolivas
6cd7f0f1be
Remove unmaintained broken ztex driver.
2013-10-07 23:33:13 +11:00
Kano
51418f79e5
Klondike update code to current git
2013-10-07 23:33:11 +11:00
Con Kolivas
f49a3c7657
Merge branch 'master' into hashfast
...
Conflicts:
Makefile.am
api.c
cgminer.c
configure.ac
miner.h
usbutils.c
usbutils.h
2013-09-30 08:43:29 +10:00
Con Kolivas
68a7e21022
Create basic placeholders for bitfury driver code.
2013-09-24 20:59:10 +10:00
Con Kolivas
cdaaff191e
Provide stubs for compiling hashfast code into makefiles.
2013-09-19 09:35:35 +10:00
Con Kolivas
7f653ba97c
Unconditionally build jansson statically from the cgminer source tree.
2013-08-30 15:38:36 +10:00
ckolivas
6df0648a41
First import of libusb-1.0
2013-08-30 15:29:02 +10:00
Con Kolivas
f3b75b0b12
Add rt lib linkage to enable use of clock_nanosleep functions with older glibc.
2013-08-18 01:39:35 +10:00
Con Kolivas
812852cc36
Move bflsc defines to a header file.
2013-08-09 06:31:57 +10:00
Kano
6219f977f6
switch icarus configuration to usb
2013-05-17 14:10:58 +10:00
Con Kolivas
fd518f1697
Add GPU-README to EXTRA_DIST.
2013-04-28 19:59:43 +10:00
Con Kolivas
4c9f2b74bf
Add an ASIC README file and udev rules file for insertion of BFL devices on linux.
2013-04-28 19:24:57 +10:00
Kano
c769db692d
bflsc v0.1
2013-04-26 10:32:28 +10:00
Con Kolivas
baa5a6e7a7
Further fix distdir for hexdump.c
2013-04-22 19:39:59 +10:00
Con Kolivas
3d835fc3e9
Fix build and distdir.
2013-04-22 19:28:50 +10:00
Con Kolivas
f4b2790761
Remove all CPU mining code.
2013-04-22 14:35:43 +10:00
Con Kolivas
3b5ef34371
Add high resolution to nmsleep wrapper on windows.
2013-04-21 18:01:49 +10:00
James Z.M. Gao
57fcd07bdd
Merge remote-tracking branch 'upstream/master'
2013-04-16 10:28:12 +08:00
James Z.M. Gao
ac053edcb4
build out of source dir
2013-04-16 10:27:10 +08:00
Con Kolivas
dea35d3349
Add Makefile entry for driver-avalon.
2013-04-05 13:32:09 +11:00
Con Kolivas
86821eb45d
Fix mingw cross compilation being broken by win32/win64 patches.
2013-04-05 11:58:21 +11:00
James Z.M. Gao
c9ae715019
Compile CPU mining for win32 and win64
2013-04-04 22:59:10 +08:00
Con Kolivas
88853a2d29
Comment out driver-bflsc.c file from Makefile.am till one exists.
2013-03-07 22:55:50 +11:00
Kano
540f3e89bc
Setup BFLSC support
2013-03-07 00:00:31 +11:00
Kano
040ec589fa
BFL USB build changes
2012-12-31 09:09:43 +11:00
Kano
152e7e36a2
mmq usb v0.4 + api usb stats
2012-12-02 21:48:37 +11:00
Peter Stuge
318ef85a9f
Require pkg-config to find libusb-1.0, and fix libusb.h #includes
2012-11-25 05:42:42 +01:00