Merge pull request #3 from fireworm71/main

get latest fireworm update
fireworm71 · Jan 16, 2018 · ba57f37 · ba57f37
2 parents 62d9d8d + b506ea6
commit ba57f37
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 2,075 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ RUN   apt-get install -qqy libjansson-dev
 
 RUN		git clone https://github.com/fireworm71/veriumMiner
 
-RUN		cd cpuminer && ./build.sh
+RUN		cd veriumMiner && ./build.sh
 
-WORKDIR		/cpuminer
+WORKDIR		/veriumMiner
 ENTRYPOINT	["./cpuminer"]
diff --git a/Makefile.am b/Makefile.am
@@ -27,9 +27,6 @@ cpuminer_SOURCES = \
 disable_flags =
 
 if USE_ASM
-if ARCH_x86
-   cpuminer_SOURCES += asm/sha2-x86.S asm/scrypt-x86.S asm/aesb-x86.S
-endif
 if ARCH_x86_64
    cpuminer_SOURCES += asm/sha2-x64.S asm/scrypt-x64.S asm/aesb-x64.S
 endif

diff --git a/asm/aesb-x86.S b/asm/aesb-x86.S