diff --git a/src/Makefile b/src/Makefile index bd16932..114aa1d 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,16 +3,16 @@ ## License.....: MIT ## -SHARED ?= 0 +SHARED ?= 1 DEBUG := 0 PRODUCTION := 1 PRODUCTION_VERSION := v6.2.0 ENABLE_CUBIN ?= 1 ENABLE_BRAIN ?= 1 -USE_SYSTEM_LZMA ?= 0 -USE_SYSTEM_ZLIB ?= 0 +USE_SYSTEM_LZMA ?= 1 +USE_SYSTEM_ZLIB ?= 1 USE_SYSTEM_OPENCL ?= 0 -USE_SYSTEM_XXHASH ?= 0 +USE_SYSTEM_XXHASH ?= 1 ## do not change, requires some hacks USE_SYSTEM_UNRAR ?= 0 @@ -100,7 +100,7 @@ VERSION_PURE := $(shell echo "$(VERSION_TAG)" | $(SED) 's/.*v\([\.0-9 ## DESTDIR ?= -PREFIX ?= /usr/local +PREFIX ?= /usr INSTALL_FOLDER ?= $(PREFIX)/bin SHARED_ROOT_FOLDER ?= $(PREFIX)/share @@ -117,7 +117,7 @@ LIBRARY_DEV_FOLDER ?= $(LIBRARY_DEV_ROOT_FOLDER)/hashcat ifeq ($(USE_SYSTEM_LZMA),0) DEPS_LZMA_PATH := deps/LZMA-SDK/C else -DEPS_LZMA_PATH := $(LIBRARY_DEV_ROOT_FOLDER) +DEPS_LZMA_PATH := /usr/include/clzma endif ifeq ($(USE_SYSTEM_ZLIB),0) @@ -169,7 +169,7 @@ endif # MSYS2 ## Misc stuff ## -COMPTIME := $(shell date +%s) +COMPTIME := 0 ## ## General compiler and linker options @@ -177,6 +177,7 @@ COMPTIME := $(shell date +%s) LFLAGS := $(LDFLAGS) +CFLAGS += $(our_CFLAGS) ifeq ($(PRODUCTION),0) CFLAGS += -W CFLAGS += -Wall @@ -219,7 +220,7 @@ endif ifeq ($(DEBUG),0) CFLAGS += -O2 ifneq ($(UNAME),Darwin) -LFLAGS += -s +LFLAGS += endif else ifeq ($(DEBUG),1) @@ -245,7 +246,7 @@ CFLAGS += -pipe -Iinclude/ -IOpenCL/ # LZMA CFLAGS += -I$(DEPS_LZMA_PATH) ifeq ($(USE_SYSTEM_LZMA),1) -LFLAGS += -llzmasdk +LFLAGS += -lclzma endif # ZLIB