Fix makefile

.gitignore

@@ -14,5 +14,8 @@
 /src/bx
 
 #eclipse cpp
+/.cproject
+/.project
 /src/.cproject
 /src/.project
+

src/Makefile

@@ -4,11 +4,11 @@
 ###############################################
 
 SHELL := /bin/bash
-CC=gcc -DUNIXLIKE -DLONG64 -I/usr/lib -L/usr/local/cuda-9.2/lib64
+CC=gcc -DUNIXLIKE -DLONG64 -I/usr/lib -L/usr/local/cuda/lib64
 #CFLAGS=-W -Wall -ansi -pedantic -g
-NVCC=nvcc -DLONG64 --generate-code arch="compute_37,code=\"sm_37,compute_37\""
+NVCC=/usr/local/cuda/bin/nvcc -DLONG64 --generate-code arch="compute_37,code=\"sm_37,compute_37\""
 LDFLAGS=-lcudart -lcuda -lstdc++
-EXEC=mochimo bval bcon bup sortlt neogen txclean wallet
+EXEC=mochimo bval bcon bup sortlt neogen wallet
 SOURCE_FOLDER=./
 BIN_FOLDER=../bin/
 OBJ_FOLDER=obj/Debug
@@ -26,19 +26,22 @@ wots.o: $(SOURCE_FOLDER)crypto/wots/wots.c
 	$(CC) -g -c $(SOURCE_FOLDER)crypto/wots/wots.c -o $(SOURCE_FOLDER)crypto/wots/wots.o $(LDFLAGS)
 
 cuda_trigg.o:
-	$(NVCC) -g -c $(SOURCE_FOLDER)trigg/cuda_trigg.cu -o $(SOURCE_FOLDER)trigg/cuda_trigg.o $(LDFLAGS)
+	$(NVCC) -g -c $(SOURCE_FOLDER)algo/trigg/cuda_trigg.cu -o $(SOURCE_FOLDER)algo/trigg/cuda_trigg.o $(LDFLAGS)
 
-trigg.o: $(SOURCE_FOLDER)trigg/trigg.c
-	$(CC) -g -c $(SOURCE_FOLDER)trigg/trigg.c -o $(SOURCE_FOLDER)trigg/trigg.o $(LDFLAGS)
+trigg.o: $(SOURCE_FOLDER)algo/trigg/trigg.c
+	$(CC) -g -c $(SOURCE_FOLDER)algo/trigg/trigg.c -o $(SOURCE_FOLDER)algo/trigg/trigg.o $(LDFLAGS)
 
-mochimo: wots.o cuda_trigg.o trigg.o sha256.o
-	$(CC) -g -o $(BIN_FOLDER)mochimo $(SOURCE_FOLDER)mochimo.c $(SOURCE_FOLDER)trigg/trigg.o $(SOURCE_FOLDER)trigg/cuda_trigg.o $(SOURCE_FOLDER)crypto/wots/wots.o $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
+mochimo: wots.o trigg.o sha256.o
+	$(CC) -g -o $(BIN_FOLDER)mochimo $(SOURCE_FOLDER)mochimo.c $(SOURCE_FOLDER)algo/trigg/trigg.o $(SOURCE_FOLDER)crypto/wots/wots.o $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
+
+cuda_mochimo: wots.o cuda_trigg.o trigg.o sha256.o
+	$(CC) -g -o $(BIN_FOLDER)mochimo $(SOURCE_FOLDER)mochimo.c $(SOURCE_FOLDER)algo/trigg/trigg.o $(SOURCE_FOLDER)algo/trigg/cuda_trigg.o $(SOURCE_FOLDER)crypto/wots/wots.o $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
 
 wallet: wots.o sha256.o
 	$(CC) -g -o $(BIN_FOLDER)wallet $(SOURCE_FOLDER)wallet.c $(SOURCE_FOLDER)crypto/wots/wots.o $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
 
 bval: wots.o trigg.o sha256.o
-	$(CC) -g -o $(BIN_FOLDER)bval $(SOURCE_FOLDER)bval.c $(SOURCE_FOLDER)trigg/trigg.o $(SOURCE_FOLDER)crypto/wots/wots.o $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
+	$(CC) -g -o $(BIN_FOLDER)bval $(SOURCE_FOLDER)bval.c $(SOURCE_FOLDER)algo/trigg/trigg.o $(SOURCE_FOLDER)crypto/wots/wots.o $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
 
 bcon: sha256.o
 	$(CC) -g -o $(BIN_FOLDER)bcon $(SOURCE_FOLDER)bcon.c $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
@@ -52,8 +55,8 @@ sortlt: sha256.o
 neogen: sha256.o
 	$(CC) -g -o $(BIN_FOLDER)neogen $(SOURCE_FOLDER)neogen.c $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
 
-txclean: sha256.o
-	$(CC) -g -o $(BIN_FOLDER)txclean $(SOURCE_FOLDER)txclean.c $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
+#txclean: sha256.o
+#	$(CC) -g -o $(BIN_FOLDER)txclean $(SOURCE_FOLDER)txclean.c $(SOURCE_FOLDER)crypto/sha256.o $(LDFLAGS)
 
 
 clean: