Skip to content

Commit

Permalink
More yasm flushing with some help for the mingw builds. Doc update to…
Browse files Browse the repository at this point in the history
… not say yasm needed any more.
  • Loading branch information
dave-andersen committed Jan 12, 2014
1 parent b478cad commit beb3512
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 19 deletions.
2 changes: 1 addition & 1 deletion INSTALL-Debian.md
Expand Up @@ -19,7 +19,7 @@ Debian Squeeze
--------------
Install the dependencies:

apt-get install build-essential libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev zlib1g-dev yasm
apt-get install build-essential libboost-system-dev libboost-filesystem-dev libboost-program-options-dev libboost-thread-dev zlib1g-dev

Compile the miner

Expand Down
5 changes: 2 additions & 3 deletions README.md
Expand Up @@ -24,19 +24,18 @@ To run, run:
For most systems, it should work to simply run:

```
cudapts <payment-address>
cudapts <payment-address> 0
```

But if you have multiple GPUs or it doesn't work, you might have to
specify cudaDevice or shamode.

You should expect to see anywhere from 200 c/m up to over 1000c/m on
You should expect to see anywhere from 200 c/m up to over 1800c/m on
high-end dual-core devices.

Build notes:
You must install:
- libboost
- yasm
- nvcc and the nvidia libraries

You must have nvcc in your path, and the nvidia libraries in your
Expand Down
5 changes: 0 additions & 5 deletions src/makefile.mingw
Expand Up @@ -44,8 +44,6 @@ LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell

OBJS= \
obj/cpuid.o \
obj/sha512_avx.o \
obj/sha512_sse4.o \
obj/sha512.o \
obj/sph_sha2.o \
obj/sph_sha2big.o \
Expand All @@ -59,9 +57,6 @@ obj/%.o: %.cpp
obj/%.o: %.c
$(CXX) -c -O2 -mtune=native -march=native -fpermissive -o $@ $<

obj/%.o: intel/%.asm
yasm -f win32 -D WINABI -o $@ $<

ptsminer.exe: $(OBJS:obj/%=obj/%)
$(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)

Expand Down
5 changes: 0 additions & 5 deletions src/makefile.mingw64
Expand Up @@ -44,8 +44,6 @@ LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell

OBJS= \
obj/cpuid.o \
obj/sha512_avx.o_asm \
obj/sha512_sse4.o_asm \
obj/sha512.o \
obj/sph_sha2.o \
obj/sph_sha2big.o \
Expand Down Expand Up @@ -112,9 +110,6 @@ obj/%.o_avx_intel: %.c
#
# ASM
#
obj/%.o_asm: intel/%.asm
yasm -f win64 -D WINABI -o $@ $<

ptsminer_amd.exe: $(OBJS:obj/%.o=obj/%.o_amd)
$(CXX) $(CPPFLAGS) $(LDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)
ptsminer_intel.exe: $(OBJS:obj/%.o=obj/%.o_intel)
Expand Down
5 changes: 0 additions & 5 deletions src/makefile.unix.no-chrono
Expand Up @@ -85,8 +85,6 @@ xLDFLAGS=$(LDHARDENING) $(LDFLAGS)

OBJS= \
obj/cpuid.o \
obj/sha512_avx.o \
obj/sha512_sse4.o \
obj/sha512.o \
obj/sph_sha2.o \
obj/sph_sha2big.o \
Expand All @@ -101,9 +99,6 @@ obj/sph_%.o: sph_%.c
obj/%.o: %.c
$(CXX) -c -O2 $(DEBUGFLAGS) -fpermissive -o $@ $<

obj/%.o: intel/%.asm
yasm -f $(YASMOUTPUT) -o $@ $<

ptsminer: $(OBJS:obj/%=obj/%)
$(CXX) $(xLDFLAGS) -o $@ $(LIBPATHS) $^ $(LIBS)

Expand Down

0 comments on commit beb3512

Please sign in to comment.