mirror of
https://github.com/hashcat/hashcat
synced 2024-11-20 23:27:31 +01:00
Merge branch 'master' into autotune_error_handling
This commit is contained in:
commit
583c8ef1bd
@ -44,6 +44,7 @@
|
|||||||
- HIP Backend: moved functions to ext_hip.c/ext_hiprtc.c and includes to ext_hip.h/ext_hiprtc.h
|
- HIP Backend: moved functions to ext_hip.c/ext_hiprtc.c and includes to ext_hip.h/ext_hiprtc.h
|
||||||
- CUDA Backend: moved functions to ext_cuda.c/ext_nvrtc.c and includes to ext_cuda.h/ext_nvrtc.h
|
- CUDA Backend: moved functions to ext_cuda.c/ext_nvrtc.c and includes to ext_cuda.h/ext_nvrtc.h
|
||||||
- Autotune: Added error handling. By default skipping device on error, with --force using accel/loops/threads min values instead
|
- Autotune: Added error handling. By default skipping device on error, with --force using accel/loops/threads min values instead
|
||||||
|
- Makefile: updated MACOSX_DEPLOYMENT_TARGET to 10.15 and removed OpenCL framework from LFLAGS_NATIVE on MacOS
|
||||||
|
|
||||||
* changes v6.2.4 -> v6.2.5
|
* changes v6.2.4 -> v6.2.5
|
||||||
|
|
||||||
|
@ -315,7 +315,7 @@ endif
|
|||||||
endif # FreeBSD
|
endif # FreeBSD
|
||||||
|
|
||||||
ifeq ($(UNAME),Darwin)
|
ifeq ($(UNAME),Darwin)
|
||||||
export MACOSX_DEPLOYMENT_TARGET=10.9
|
export MACOSX_DEPLOYMENT_TARGET=10.15
|
||||||
CFLAGS_NATIVE := $(CFLAGS)
|
CFLAGS_NATIVE := $(CFLAGS)
|
||||||
CFLAGS_NATIVE += -DWITH_HWMON
|
CFLAGS_NATIVE += -DWITH_HWMON
|
||||||
|
|
||||||
@ -324,7 +324,6 @@ CFLAGS_NATIVE += -DMISSING_CLOCK_GETTIME
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
LFLAGS_NATIVE := $(LFLAGS)
|
LFLAGS_NATIVE := $(LFLAGS)
|
||||||
LFLAGS_NATIVE += -framework OpenCL
|
|
||||||
LFLAGS_NATIVE += -framework IOKit
|
LFLAGS_NATIVE += -framework IOKit
|
||||||
LFLAGS_NATIVE += -lpthread
|
LFLAGS_NATIVE += -lpthread
|
||||||
LFLAGS_NATIVE += -liconv
|
LFLAGS_NATIVE += -liconv
|
||||||
|
Loading…
Reference in New Issue
Block a user