Merge pull request #98 from ixfd64/build/icon-dependency-fix

fix icon-related dependencies order in Windows makefile

Author: N-Storm

src/Makefile.win

@@ -49,7 +49,7 @@ INSTALL = copy
 
 ############################################################################################################
 
-all : ..\mfaktc-win-64.exe ..\mfaktc.ini $(ICON)
+all : ..\mfaktc-win-64.exe ..\mfaktc.ini
 
 ..\mfaktc-win-64.exe : $(COBJS) $(CUOBJS) $(RES)
 	$(LINK) $(LFLAGS) $^ $(LIBS) /out:$@
@@ -65,7 +65,7 @@ clean :
 %.rc : assets\\%.rc
 	$(INSTALL) $< .
 
-%.res : %.rc
+%.res : %.rc $(ICON)
 	rc /fo $@ $<
 
 tf_75bit.obj : tf_96bit.cu

src/create_dependencies.sh

@@ -27,26 +27,26 @@ case "${1}" in
     ;;
 esac
 
-(
 # need to define CUDA runtime version during cpp runs because we ignore
 # system includes.
 
 # special code for mfaktc.c that includes either selftest-data-mersenne.c or
 # selftest-data-wagstaff.c, depending on whether mfaktc is configured for
 # Mersenne or Wagstaff numbers in params.h. For simplicity's sake, we just add
 # both files.
-cpp -D CUDART_VERSION=6050 -include selftest-data-mersenne.c -include \
+(
+cpp -D CUDART_VERSION=13000 -include selftest-data-mersenne.c -include \
     selftest-data-wagstaff.c -MM mfaktc.c
 echo
 
 for FILE in checkpoint.c output.c parse.c read_config.c sieve.c \
             signal_handler.c timer.c tf_96bit.cu tf_barrett96.cu \
             tf_barrett96_gs.cu gpusieve.cu cuda_utils.cu crc.c
 do
-  cpp -D CUDART_VERSION=6050 -MM ${FILE}
+  cpp -D CUDART_VERSION=13000 -MM ${FILE}
   echo
 done
 
 # special case for 75-bit kernels
-cpp -D CUDART_VERSION=6050 -MM tf_96bit.cu -MT tf_75bit.o
+cpp -D CUDART_VERSION=13000 -MM tf_96bit.cu -MT tf_75bit.o
 ) | sed s@\.o:@\.${OBJ}:@