From 2530f83029da1f657ae54bea62f2a1d90a806b99 Mon Sep 17 00:00:00 2001 From: jsteube Date: Mon, 23 Jul 2018 13:36:23 +0200 Subject: [PATCH] Move LZMA SDK files into separate folder for compiling --- {include => deps}/lzma_sdk/7zTypes.h | 0 {src => deps}/lzma_sdk/Alloc.c | 0 {include => deps}/lzma_sdk/Alloc.h | 0 {include => deps}/lzma_sdk/Compiler.h | 0 {src => deps}/lzma_sdk/Lzma2Dec.c | 0 {include => deps}/lzma_sdk/Lzma2Dec.h | 0 {src => deps}/lzma_sdk/LzmaDec.c | 0 {include => deps}/lzma_sdk/LzmaDec.h | 0 {include => deps}/lzma_sdk/Precomp.h | 0 obj/{lzma_sdk => }/.lock | 0 src/Makefile | 46 ++++++++++++++++++++++----- 11 files changed, 38 insertions(+), 8 deletions(-) rename {include => deps}/lzma_sdk/7zTypes.h (100%) rename {src => deps}/lzma_sdk/Alloc.c (100%) rename {include => deps}/lzma_sdk/Alloc.h (100%) rename {include => deps}/lzma_sdk/Compiler.h (100%) rename {src => deps}/lzma_sdk/Lzma2Dec.c (100%) rename {include => deps}/lzma_sdk/Lzma2Dec.h (100%) rename {src => deps}/lzma_sdk/LzmaDec.c (100%) rename {include => deps}/lzma_sdk/LzmaDec.h (100%) rename {include => deps}/lzma_sdk/Precomp.h (100%) rename obj/{lzma_sdk => }/.lock (100%) diff --git a/include/lzma_sdk/7zTypes.h b/deps/lzma_sdk/7zTypes.h similarity index 100% rename from include/lzma_sdk/7zTypes.h rename to deps/lzma_sdk/7zTypes.h diff --git a/src/lzma_sdk/Alloc.c b/deps/lzma_sdk/Alloc.c similarity index 100% rename from src/lzma_sdk/Alloc.c rename to deps/lzma_sdk/Alloc.c diff --git a/include/lzma_sdk/Alloc.h b/deps/lzma_sdk/Alloc.h similarity index 100% rename from include/lzma_sdk/Alloc.h rename to deps/lzma_sdk/Alloc.h diff --git a/include/lzma_sdk/Compiler.h b/deps/lzma_sdk/Compiler.h similarity index 100% rename from include/lzma_sdk/Compiler.h rename to deps/lzma_sdk/Compiler.h diff --git a/src/lzma_sdk/Lzma2Dec.c b/deps/lzma_sdk/Lzma2Dec.c similarity index 100% rename from src/lzma_sdk/Lzma2Dec.c rename to deps/lzma_sdk/Lzma2Dec.c diff --git a/include/lzma_sdk/Lzma2Dec.h b/deps/lzma_sdk/Lzma2Dec.h similarity index 100% rename from include/lzma_sdk/Lzma2Dec.h rename to deps/lzma_sdk/Lzma2Dec.h diff --git a/src/lzma_sdk/LzmaDec.c b/deps/lzma_sdk/LzmaDec.c similarity index 100% rename from src/lzma_sdk/LzmaDec.c rename to deps/lzma_sdk/LzmaDec.c diff --git a/include/lzma_sdk/LzmaDec.h b/deps/lzma_sdk/LzmaDec.h similarity index 100% rename from include/lzma_sdk/LzmaDec.h rename to deps/lzma_sdk/LzmaDec.h diff --git a/include/lzma_sdk/Precomp.h b/deps/lzma_sdk/Precomp.h similarity index 100% rename from include/lzma_sdk/Precomp.h rename to deps/lzma_sdk/Precomp.h diff --git a/obj/lzma_sdk/.lock b/obj/.lock similarity index 100% rename from obj/lzma_sdk/.lock rename to obj/.lock diff --git a/src/Makefile b/src/Makefile index 506ae9ba2..218bf99c9 100644 --- a/src/Makefile +++ b/src/Makefile @@ -187,11 +187,11 @@ endif #CFLAGS += -Wstack-usage=524288 -ifeq ($(SYSTEM_LZMA_SDK),1) +ifeq ($(SYSTEM_LZMA_SDK),0) +CFLAGS += -Ideps/lzma_sdk/ +else CFLAGS += $(LZMA_SDK_INCLUDE) LDFLAGS += -llzmasdk -else -CFLAGS +=-Iinclude/lzma_sdk/ endif LFLAGS := $(LDFLAGS) @@ -312,10 +312,6 @@ LFLAGS_CROSS_WIN64 += -lpsapi OBJS_ALL := affinity autotune benchmark bitmap bitops combinator common convert cpt cpu_aes cpu_crc32 cpu_des cpu_md4 cpu_md5 cpu_sha1 cpu_sha256 debugfile dictstat dispatch dynloader event ext_ADL ext_nvapi ext_nvml ext_OpenCL ext_sysfs ext_lzma filehandling folder hashcat hashes hlfmt hwmon induct interface locking logfile loopback memory monitor mpsp opencl outfile_check outfile pidfile potfile restore rp rp_cpu rp_kernel_on_cpu rp_kernel_on_cpu_optimized selftest shared status stdout straight terminal thread timer tuningdb usage user_options wordlist -ifeq ($(SYSTEM_LZMA_SDK),0) -OBJS_ALL += lzma_sdk/Alloc lzma_sdk/Lzma2Dec lzma_sdk/LzmaDec -endif - NATIVE_STATIC_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.STATIC.o) NATIVE_SHARED_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.SHARED.o) @@ -325,6 +321,19 @@ LINUX_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.64.o) WIN_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o) WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.o) +ifeq ($(SYSTEM_LZMA_SDK),0) +OBJS_LZMA := Alloc Lzma2Dec LzmaDec + +NATIVE_STATIC_OBJS += $(foreach OBJ,$(OBJS_LZMA),obj/$(OBJ).NATIVE.STATIC.o) +NATIVE_SHARED_OBJS += $(foreach OBJ,$(OBJS_LZMA),obj/$(OBJ).NATIVE.SHARED.o) + +LINUX_32_OBJS += $(foreach OBJ,$(OBJS_LZMA),obj/$(OBJ).LINUX.32.o) +LINUX_64_OBJS += $(foreach OBJ,$(OBJS_LZMA),obj/$(OBJ).LINUX.64.o) + +WIN_32_OBJS += $(foreach OBJ,$(OBJS_LZMA),obj/$(OBJ).WIN.32.o) +WIN_64_OBJS += $(foreach OBJ,$(OBJS_LZMA),obj/$(OBJ).WIN.64.o) +endif + ## ## Targets: Native Compilation ## @@ -334,7 +343,6 @@ default: $(HASHCAT_FRONTEND) clean: $(RM) -f $(HASHCAT_FRONTEND) $(RM) -f $(HASHCAT_LIBRARY) - $(RM) -f obj/lzma_sdk/*.o $(RM) -f obj/*.o $(RM) -f *.bin *.exe $(RM) -f *.pid @@ -461,6 +469,14 @@ obj/%.NATIVE.STATIC.o: src/%.c obj/%.NATIVE.SHARED.o: src/%.c $(CC) -c $(CFLAGS_NATIVE) $< -o $@ -fpic +ifeq ($(SYSTEM_LZMA_SDK),0) +obj/%.NATIVE.STATIC.o: deps/lzma_sdk/%.c + $(CC) -c $(CFLAGS_NATIVE) $< -o $@ + +obj/%.NATIVE.SHARED.o: deps/lzma_sdk/%.c + $(CC) -c $(CFLAGS_NATIVE) $< -o $@ -fpic +endif + $(HASHCAT_LIBRARY): $(NATIVE_SHARED_OBJS) $(CC) $^ -o $@ $(LFLAGS_NATIVE) -shared -Wl,-soname,$(HASHCAT_LIBRARY) @@ -488,6 +504,20 @@ obj/%.WIN.32.o: src/%.c obj/%.WIN.64.o: src/%.c $(CC_WIN_64) $(CFLAGS_CROSS_WIN64) -c -o $@ $< +ifeq ($(SYSTEM_LZMA_SDK),0) +obj/%.LINUX.32.o: deps/lzma_sdk/%.c + $(CC_LINUX_32) $(CFLAGS_CROSS_LINUX32) -c -o $@ $< + +obj/%.LINUX.64.o: deps/lzma_sdk/%.c + $(CC_LINUX_64) $(CFLAGS_CROSS_LINUX64) -c -o $@ $< + +obj/%.WIN.32.o: deps/lzma_sdk/%.c + $(CC_WIN_32) $(CFLAGS_CROSS_WIN32) -c -o $@ $< + +obj/%.WIN.64.o: deps/lzma_sdk/%.c + $(CC_WIN_64) $(CFLAGS_CROSS_WIN64) -c -o $@ $< +endif + hashcat32.bin: src/main.c $(LINUX_32_OBJS) $(CC_LINUX_32) $(CFLAGS_CROSS_LINUX32) -o $@ $^ $(LFLAGS_CROSS_LINUX32) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"