Skip to content
Browse files

More yasm flushing with some help for the mingw builds. Doc update to…

… not say yasm needed any more.
  • Loading branch information...
1 parent b478cad commit beb35129046541947132ed7b6ebdaf6876c8626b @dave-andersen committed Jan 11, 2014
Showing with 3 additions and 19 deletions.
  1. +1 −1 INSTALL-Debian.md
  2. +2 −3 README.md
  3. +0 −5 src/makefile.mingw
  4. +0 −5 src/makefile.mingw64
  5. +0 −5 src/makefile.unix.no-chrono
View
2 INSTALL-Debian.md
@@ -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
View
5 README.md
@@ -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
View
5 src/makefile.mingw
@@ -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 \
@@ -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)
View
5 src/makefile.mingw64
@@ -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 \
@@ -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)
View
5 src/makefile.unix.no-chrono
@@ -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 \
@@ -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)

0 comments on commit beb3512

Please sign in to comment.
Something went wrong with that request. Please try again.