arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-21 23:58:07 +00:00
Code Issues Releases Wiki Activity

Move LZMA SDK files into separate folder for compiling

Browse Source
This commit is contained in:
jsteube 2018-07-23 13:36:23 +02:00
parent 81f909e229
commit 2530f83029
11 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
include/lzma_sdk/7zTypes.h → deps/lzma_sdk/7zTypes.h vendored
View File

0
src/lzma_sdk/Alloc.c → deps/lzma_sdk/Alloc.c vendored
View File

0
include/lzma_sdk/Alloc.h → deps/lzma_sdk/Alloc.h vendored
View File

0
include/lzma_sdk/Compiler.h → deps/lzma_sdk/Compiler.h vendored
View File

0
src/lzma_sdk/Lzma2Dec.c → deps/lzma_sdk/Lzma2Dec.c vendored
View File

0
include/lzma_sdk/Lzma2Dec.h → deps/lzma_sdk/Lzma2Dec.h vendored
View File

0
src/lzma_sdk/LzmaDec.c → deps/lzma_sdk/LzmaDec.c vendored
View File

0
include/lzma_sdk/LzmaDec.h → deps/lzma_sdk/LzmaDec.h vendored
View File

0
include/lzma_sdk/Precomp.h → deps/lzma_sdk/Precomp.h vendored
View File

0
obj/lzma_sdk/.lock → obj/.lock
View File

46
src/Makefile
View File

@ -187,11 +187,11 @@ endif
#CFLAGS += -Wstack-usage=524288 #CFLAGS += -Wstack-usage=524288
ifeq ($(SYSTEM_LZMA_SDK),1) ifeq ($(SYSTEM_LZMA_SDK),0)
CFLAGS += -Ideps/lzma_sdk/
else
CFLAGS += $(LZMA_SDK_INCLUDE) CFLAGS += $(LZMA_SDK_INCLUDE)
LDFLAGS += -llzmasdk LDFLAGS += -llzmasdk
else
CFLAGS +=-Iinclude/lzma_sdk/
endif endif
LFLAGS := $(LDFLAGS) 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 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_STATIC_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.STATIC.o)
NATIVE_SHARED_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.SHARED.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_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.32.o)
WIN_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).WIN.64.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 ## Targets: Native Compilation
## ##
@ -334,7 +343,6 @@ default: $(HASHCAT_FRONTEND)
clean: clean:
$(RM) -f $(HASHCAT_FRONTEND) $(RM) -f $(HASHCAT_FRONTEND)
$(RM) -f $(HASHCAT_LIBRARY) $(RM) -f $(HASHCAT_LIBRARY)
$(RM) -f obj/lzma_sdk/*.o
$(RM) -f obj/*.o $(RM) -f obj/*.o
$(RM) -f *.bin *.exe $(RM) -f *.bin *.exe
$(RM) -f *.pid $(RM) -f *.pid
@ -461,6 +469,14 @@ obj/%.NATIVE.STATIC.o: src/%.c
obj/%.NATIVE.SHARED.o: src/%.c obj/%.NATIVE.SHARED.o: src/%.c
$(CC) -c $(CFLAGS_NATIVE) $< -o $@ -fpic $(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) $(HASHCAT_LIBRARY): $(NATIVE_SHARED_OBJS)
$(CC) $^ -o $@ $(LFLAGS_NATIVE) -shared -Wl,-soname,$(HASHCAT_LIBRARY) $(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 obj/%.WIN.64.o: src/%.c
$(CC_WIN_64) $(CFLAGS_CROSS_WIN64) -c -o $@ $< $(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) 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)\" $(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)\"