##
-## Author......: Jens Steube <jens.steube@gmail.com>
+## Authors.....: Jens Steube <jens.steube@gmail.com>
+## Gabriele Gristina <matrix@hashcat.net>
+## magnum <john.magnum@hushmail.com>
+##
## License.....: MIT
##
+PROG_NAME := hashcat
+
+##
+## Detect Operating System
+##
+
+UNAME := $(shell uname -s)
+
+# we need to strip the windows version number to be able to build hashcat on cygwin hosts
+UNAME := $(patsubst CYGWIN_NT-%,CYGWIN_NT-,$(UNAME))
+
+ifeq (,$(filter $(UNAME),Linux Darwin CYGWIN_NT- FreeBSD))
+$(error "! Your Operating System ($(UNAME)) is not supported by $(PROG_NAME) Makefile")
+endif
+
+ifeq ($(DEBUG),1)
+$(warning "## Detected Operating System : $(UNAME)")
+endif
+
##
## Makefile flags
##
-MAKEFLAGS += -l -j -rR --no-print-directory
+MAKEFLAGS += -l -j -rR --no-print-directory
ifneq ($(findstring clean,$(MAKECMDGOALS)),)
-MAKEFLAGS += -j 1
+MAKEFLAGS += -j 1
endif
##
## Installation paths (Linux only)
##
+DESTDIR ?=
PREFIX ?= /usr/local
INSTALL_FOLDER ?= $(PREFIX)/bin
-SHARED_FOLDER ?= $(PREFIX)/share/oclHashcat
-DOCUMENT_FOLDER ?= $(PREFIX)/share/doc/oclHashcat
+SHARED_FOLDER ?= $(PREFIX)/share/$(PROG_NAME)
+DOCUMENT_FOLDER ?= $(PREFIX)/share/doc/$(PROG_NAME)
##
-## Depencies
-##
-
-ADL := deps/adl-sdk
-GDK := deps/nvidia-gdk
-NVAPI := deps/R352-developer
-
-##
-## Depencies, cross compilation only
+## Dependencies
+## You may ignore them if you're compiling only a native binary and
+## You have your own headers somewhere, for example: apt-get install opencl-headers
##
OPENCL_HEADERS_KHRONOS := deps/OpenCL-Headers
-##
-## Library paths
-##
-
-NVML := $(GDK)/usr/include/nvidia/gdk
-
##
## Native compiler paths
##
-CP := cp
-RM := rm
+CC := gcc
+FIND := find
INSTALL := install
-
-CC_NATIVE := clang
+RM := rm
+SED := sed
+ifeq ($(UNAME),Darwin)
+SED := gsed
+endif
+ifeq ($(UNAME),FreeBSD)
+CC := cc
+SED := gsed
+endif
##
## Cross compiler paths
CC_WIN_32 := i686-w64-mingw32-gcc
CC_WIN_64 := x86_64-w64-mingw32-gcc
-DLL_WIN_32 := i686-w64-mingw32-dlltool
-DLL_WIN_64 := x86_64-w64-mingw32-dlltool
-
##
## Misc stuff
##
-NOW := $(shell date +%s)
+COMPTIME := $(shell date +%s)
+
+VERSION_EXPORT := $Format:%D$
+VERSION_TAG := $(shell test -d .git && git describe --tags --dirty=+ || echo "$(VERSION_EXPORT)"|cut -d, -f2|$(SED) -r 's|.* (\w+/)?([^ ]+)|\2|')
##
## Compiler flags
##
-#CFLAGS := -O2 -s -pipe -W -Wall -std=c99 -Iinclude/
-CFLAGS := -g -ggdb -pipe -W -Wall -std=c99 -Iinclude/ -fsanitize=undefined -fno-omit-frame-pointer
+CFLAGS += -pipe -W -Wall -std=c99 -Iinclude/ -IOpenCL/ -I$(OPENCL_HEADERS_KHRONOS)/
+
+ifndef DEBUG
+CFLAGS += -O2
+else
+CFLAGS += -DDEBUG -g -ggdb
+ifeq ($(DEBUG),2)
+CFLAGS += -fsanitize=address -fno-omit-frame-pointer
+endif
+endif
##
## Native compilation target
##
-CFLAGS_NATIVE := -D_POSIX -DLINUX
+BINARY_NATIVE := $(PROG_NAME)
+
+ifeq ($(UNAME),Darwin)
+export MACOSX_DEPLOYMENT_TARGET=10.9
+CFLAGS_NATIVE := -D_POSIX
+CFLAGS_NATIVE += $(CFLAGS)
+LFLAGS_NATIVE := -lpthread
+LFLAGS_NATIVE += $(LDFLAGS)
+endif # darwin
+
+ifeq ($(UNAME),Linux)
+CFLAGS_NATIVE := -D_POSIX
+ifndef DEBUG
+CFLAGS_NATIVE += -s
+endif
CFLAGS_NATIVE += $(CFLAGS)
-CFLAGS_NATIVE += -I$(ADL)/include/
-CFLAGS_NATIVE += -I$(NVML)/
+LFLAGS_NATIVE := -lpthread -ldl
+CFLAGS_NATIVE += -DHAVE_HWMON
+LFLAGS_NATIVE += $(LDFLAGS)
+endif # linux
-LFLAGS_NATIVE := -lpthread -lOpenCL -ldl
+ifeq ($(UNAME),FreeBSD)
+CFLAGS_NATIVE := -D_POSIX
+CFLAGS_NATIVE += $(CFLAGS)
+LFLAGS_NATIVE := -lpthread
+LFLAGS_NATIVE += $(LDFLAGS)
+endif # freebsd
##
## Cross compilation target
##
-CFLAGS_CROSS_LINUX := -D_POSIX -DLINUX
+CFLAGS_CROSS_LINUX := -D_POSIX
+ifndef DEBUG
+CFLAGS_CROSS_LINUX += -s
+endif
CFLAGS_CROSS_LINUX += $(CFLAGS)
-CFLAGS_CROSS_LINUX += -I$(OPENCL_HEADERS_KHRONOS)/
-CFLAGS_CROSS_LINUX += -I$(ADL)/include/
-CFLAGS_CROSS_LINUX += -I$(NVML)/
+CFLAGS_CROSS_LINUX += -DHAVE_HWMON
-CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
-CFLAGS_CROSS_WIN += $(CFLAGS)
-CFLAGS_CROSS_WIN += -I$(OPENCL_HEADERS_KHRONOS)/
-CFLAGS_CROSS_WIN += -I$(ADL)/include/
-CFLAGS_CROSS_WIN += -I$(NVAPI)/
+CFLAGS_CROSS_WIN := -D_WIN -DWIN -D__MSVCRT__ -D__USE_MINGW_ANSI_STDIO=1
+ifndef DEBUG
+CFLAGS_CROSS_WIN += -s
+endif
+CFLAGS_CROSS_WIN += $(filter-out -fsanitize=address,$(CFLAGS))
+CFLAGS_CROSS_WIN += -DHAVE_HWMON
CFLAGS_CROSS_32 := -m32
CFLAGS_CROSS_64 := -m64
-LFLAGS_CROSS_LINUX := -lpthread -lOpenCL -ldl
+LFLAGS_CROSS_LINUX := -lpthread -ldl
LFLAGS_CROSS_WIN := -lpsapi
+##
+## Objects
+##
+
+NATIVE_OBJS := obj/ext_OpenCL.NATIVE.o obj/shared.NATIVE.o obj/rp_kernel_on_cpu.NATIVE.o
+
+ifeq ($(UNAME),Linux)
+NATIVE_OBJS += obj/ext_ADL.NATIVE.o
+NATIVE_OBJS += obj/ext_nvapi.NATIVE.o
+NATIVE_OBJS += obj/ext_nvml.NATIVE.o
+NATIVE_OBJS += obj/ext_xnvctrl.NATIVE.o
+endif
+
+LINUX_32_OBJS := obj/ext_OpenCL.LINUX.32.o obj/shared.LINUX.32.o obj/rp_kernel_on_cpu.LINUX.32.o obj/ext_ADL.LINUX.32.o obj/ext_nvml.LINUX.32.o obj/ext_nvapi.LINUX.32.o obj/ext_xnvctrl.LINUX.32.o
+LINUX_64_OBJS := obj/ext_OpenCL.LINUX.64.o obj/shared.LINUX.64.o obj/rp_kernel_on_cpu.LINUX.64.o obj/ext_ADL.LINUX.64.o obj/ext_nvml.LINUX.64.o obj/ext_nvapi.LINUX.64.o obj/ext_xnvctrl.LINUX.64.o
+
+## may need to adjust according to your mingw distribution
+CRT_GLOB_32 := /usr/i686-w64-mingw32/lib/CRT_glob.o
+CRT_GLOB_64 := /usr/x86_64-w64-mingw32/lib/CRT_glob.o
+
+WIN_32_OBJS := obj/ext_OpenCL.WIN.32.o obj/shared.WIN.32.o obj/rp_kernel_on_cpu.WIN.32.o obj/ext_ADL.WIN.32.o obj/ext_nvml.WIN.32.o obj/ext_nvapi.WIN.32.o obj/ext_xnvctrl.WIN.32.o $(CRT_GLOB_32)
+WIN_64_OBJS := obj/ext_OpenCL.WIN.64.o obj/shared.WIN.64.o obj/rp_kernel_on_cpu.WIN.64.o obj/ext_ADL.WIN.64.o obj/ext_nvml.WIN.64.o obj/ext_nvapi.WIN.64.o obj/ext_xnvctrl.WIN.64.o $(CRT_GLOB_64)
+
##
## Targets: Global
##
-native: oclHashcat
+native: hashcat
binaries: linux32 linux64 win32 win64
clean:
- $(RM) -f obj/*.o lib/*.a ./*.bin ./*.exe ./*.app *.restore *.out *.pot *.dictstat *.log oclHashcat core
+ $(RM) -f obj/*.o *.bin *.exe *.restore *.out *.pot *.log hashcat core
$(RM) -rf *.induct
$(RM) -rf *.outfiles
+ $(RM) -rf *.dSYM
$(RM) -rf kernels
-linux32: oclHashcat32.bin
-linux64: oclHashcat64.bin
+linux32: hashcat32.bin
+linux64: hashcat64.bin
-win32: oclHashcat32.exe
-win64: oclHashcat64.exe
+win32: hashcat32.exe
+win64: hashcat64.exe
##
## Targets: Linux install
##
install: native
- $(INSTALL) -m 755 -d $(DOCUMENT_FOLDER)
- $(CP) -a docs/* $(DOCUMENT_FOLDER)/
- $(CP) -a example*.sh $(DOCUMENT_FOLDER)/
- $(CP) -a example*.hash $(DOCUMENT_FOLDER)/
- $(INSTALL) -m 644 example.dict $(DOCUMENT_FOLDER)/
- $(INSTALL) -m 755 -d $(DOCUMENT_FOLDER)/extra
- $(CP) -a extra/* $(DOCUMENT_FOLDER)/extra/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/charsets
- $(CP) -a charsets/* $(SHARED_FOLDER)/charsets/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/masks
- $(CP) -a masks/* $(SHARED_FOLDER)/masks/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/include
- $(INSTALL) -m 644 include/constants.h $(SHARED_FOLDER)/include/
- $(INSTALL) -m 644 include/kernel_functions.c $(SHARED_FOLDER)/include/
- $(INSTALL) -m 644 include/kernel_vendor.h $(SHARED_FOLDER)/include/
- $(INSTALL) -m 644 include/rp_kernel.h $(SHARED_FOLDER)/include/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/OpenCL
- $(CP) -a OpenCL/* $(SHARED_FOLDER)/OpenCL/
- $(INSTALL) -m 755 -d $(SHARED_FOLDER)/rules
- $(CP) -a rules/* $(SHARED_FOLDER)/rules/
- $(INSTALL) -m 644 hashcat.hcstat $(SHARED_FOLDER)/
- $(INSTALL) -m 755 oclHashcat $(INSTALL_FOLDER)/
+ $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(INSTALL_FOLDER)
+ $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/docs
+ $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/extra
+ $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/extra/tab_completion
+ $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/charsets
+ $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/masks
+ $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/OpenCL
+ $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/rules
+ $(INSTALL) -m 644 example.dict $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 644 example0.hash $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 644 example400.hash $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 644 example500.hash $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 755 example0.sh $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 755 example400.sh $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 755 example500.sh $(DESTDIR)$(DOCUMENT_FOLDER)/
+ $(INSTALL) -m 644 extra/tab_completion/hashcat.sh $(DESTDIR)$(DOCUMENT_FOLDER)/extra/tab_completion/
+ $(INSTALL) -m 644 extra/tab_completion/howto.txt $(DESTDIR)$(DOCUMENT_FOLDER)/extra/tab_completion/
+ $(INSTALL) -m 755 extra/tab_completion/install $(DESTDIR)$(DOCUMENT_FOLDER)/extra/tab_completion/
+ $(INSTALL) -m 644 hashcat.hcstat $(DESTDIR)$(SHARED_FOLDER)/
+ $(INSTALL) -m 644 hashcat.hctune $(DESTDIR)$(SHARED_FOLDER)/
+ $(INSTALL) -m 755 $(BINARY_NATIVE) $(DESTDIR)$(INSTALL_FOLDER)/
+ $(FIND) docs/ -type d -exec $(INSTALL) -m 755 -d $(DESTDIR)$(DOCUMENT_FOLDER)/{} \;
+ $(FIND) charsets/ -type d -exec $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) masks/ -type d -exec $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) OpenCL/ -type d -exec $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) rules/ -type d -exec $(INSTALL) -m 755 -d $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) docs/ -type f -exec $(INSTALL) -m 644 {} $(DESTDIR)$(DOCUMENT_FOLDER)/{} \;
+ $(FIND) charsets/ -type f -exec $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) masks/ -type f -exec $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) OpenCL/ -type f -exec $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(FIND) rules/ -type f -exec $(INSTALL) -m 644 {} $(DESTDIR)$(SHARED_FOLDER)/{} \;
+ $(SED) -i 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example0.sh
+ $(SED) -i 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example400.sh
+ $(SED) -i 's/\.\/hashcat/hashcat/' $(DESTDIR)$(DOCUMENT_FOLDER)/example500.sh
uninstall:
- $(RM) -f $(INSTALL_FOLDER)/oclHashcat
- $(RM) -rf $(SHARED_FOLDER)
- $(RM) -rf $(DOCUMENT_FOLDER)
-
-##
-## Targets: Libraries
-##
-
-lib/libOpenCL.a:
- ${DLL_WIN_32} -A -k -l lib/libOpenCL.a -d lib/OpenCL.def
-
-lib/libOpenCL64.a:
- ${DLL_WIN_64} -A -k -l lib/libOpenCL64.a -d lib/OpenCL64.def
+ $(RM) -f $(DESTDIR)$(INSTALL_FOLDER)/$(BINARY_NATIVE)
+ $(RM) -rf $(DESTDIR)$(SHARED_FOLDER)
+ $(RM) -rf $(DESTDIR)$(DOCUMENT_FOLDER)
##
-## native compiled oclHashcat
+## native compiled hashcat
##
-obj/%.oclHashcat.NATIVE.o: src/%.c
- $(CC_NATIVE) $(CFLAGS_NATIVE) -c -o $@ $<
+obj/%.NATIVE.o: src/%.c
+ $(CC) $(CFLAGS_NATIVE) -c -o $@ $<
-oclHashcat: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.NATIVE.o obj/ext_nvml.oclHashcat.NATIVE.o obj/ext_ADL.oclHashcat.NATIVE.o obj/shared.oclHashcat.NATIVE.o obj/rp_kernel_on_cpu.oclHashcat.NATIVE.o
- $(CC_NATIVE) $(CFLAGS_NATIVE) -o $@ $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
+hashcat: src/hashcat.c $(NATIVE_OBJS)
+ $(CC) $(CFLAGS_NATIVE) -o $(BINARY_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
##
-## cross compiled oclHashcat for binary release version
+## cross compiled hashcat for binary release version
##
-obj/%.oclHashcat.LINUX.32.o: src/%.c
- $(CC_LINUX_32) $(CFLAGS_CROSS) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -c -o $@ $<
+obj/%.LINUX.32.o: src/%.c
+ $(CC_LINUX_32) -D_LINUX32 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -c -o $@ $<
-obj/%.oclHashcat.LINUX.64.o: src/%.c
- $(CC_LINUX_64) $(CFLAGS_CROSS) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
+obj/%.LINUX.64.o: src/%.c
+ $(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
-obj/%.oclHashcat.WIN.32.o: src/%.c
- $(CC_WIN_32) $(CFLAGS_CROSS) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -c -o $@ $<
+obj/%.WIN.32.o: src/%.c
+ $(CC_WIN_32) -D_WIN32 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -c -o $@ $<
-obj/%.oclHashcat.WIN.64.o: src/%.c
- $(CC_WIN_64) $(CFLAGS_CROSS) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -c -o $@ $<
+obj/%.WIN.64.o: src/%.c
+ $(CC_WIN_64) -D_WIN64 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -c -o $@ $<
-oclHashcat32.bin: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.LINUX.32.o obj/ext_nvml.oclHashcat.LINUX.32.o obj/ext_ADL.oclHashcat.LINUX.32.o obj/shared.oclHashcat.LINUX.32.o obj/rp_kernel_on_cpu.oclHashcat.LINUX.32.o
- $(CC_LINUX_32) $(CFLAGS_CROSS) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
+hashcat32.bin: src/hashcat.c $(LINUX_32_OBJS)
+ $(CC_LINUX_32) -D_LINUX32 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
-oclHashcat64.bin: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.LINUX.64.o obj/ext_nvml.oclHashcat.LINUX.64.o obj/ext_ADL.oclHashcat.LINUX.64.o obj/shared.oclHashcat.LINUX.64.o obj/rp_kernel_on_cpu.oclHashcat.LINUX.64.o
- $(CC_LINUX_64) $(CFLAGS_CROSS) $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(NOW) -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
+hashcat64.bin: src/hashcat.c $(LINUX_64_OBJS)
+ $(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_LINUX) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\"
-oclHashcat32.exe: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.WIN.32.o obj/ext_nvapi.oclHashcat.WIN.32.o obj/ext_ADL.oclHashcat.WIN.32.o obj/shared.oclHashcat.WIN.32.o obj/rp_kernel_on_cpu.oclHashcat.WIN.32.o lib/libOpenCL.a /usr/i686-w64-mingw32/lib/CRT_glob.o $(NVAPI)/x86/nvapi.lib
- $(CC_WIN_32) $(CFLAGS_CROSS) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(NOW) -static-libgcc
+hashcat32.exe: src/hashcat.c $(WIN_32_OBJS)
+ $(CC_WIN_32) -D_WIN32 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_32) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -static-libgcc
-oclHashcat64.exe: src/oclHashcat.c obj/ext_OpenCL.oclHashcat.WIN.64.o obj/ext_nvapi.oclHashcat.WIN.64.o obj/ext_ADL.oclHashcat.WIN.64.o obj/shared.oclHashcat.WIN.64.o obj/rp_kernel_on_cpu.oclHashcat.WIN.64.o lib/libOpenCL64.a /usr/x86_64-w64-mingw32/lib/CRT_glob.o $(NVAPI)/amd64/nvapi64.lib
- $(CC_WIN_64) $(CFLAGS_CROSS) $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(NOW) -static-libgcc
+hashcat64.exe: src/hashcat.c $(WIN_64_OBJS)
+ $(CC_WIN_64) -D_WIN64 $(CFLAGS_CROSS_WIN) $(CFLAGS_CROSS_64) -o $@ $^ $(LFLAGS_CROSS_WIN) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -static-libgcc
projects / hashcat.git / blobdiff