From: Jens Steube <jens.steube@gmail.com>
Date: Fri, 10 Jun 2016 21:51:04 +0000 (+0200)
Subject: Merge pull request #364 from neheb/patch-2
X-Git-Tag: v3.00~72
X-Git-Url: https://www.flypig.org.uk/git/?a=commitdiff_plain;h=10b086a31d674d17da47304bcb542ec6b7202170;hp=-c;p=hashcat.git

Merge pull request #364 from neheb/patch-2

Add cygwin support
---

10b086a31d674d17da47304bcb542ec6b7202170
diff --combined src/Makefile
index 73cf662,2ca5fd0..b25f769
--- a/src/Makefile
+++ b/src/Makefile
@@@ -13,8 -13,9 +13,9 @@@ PROG_NAME                := hashca
  ##
  
  UNAME                    := $(shell uname -s)
+ UNAME			 := $(patsubst CYGWIN_NT-%,CYGWIN_NT-,$(UNAME))
  
- ifeq (,$(filter $(UNAME),Linux Darwin))
+ ifeq (,$(filter $(UNAME),Linux Darwin CYGWIN_NT-))
  $(error "! Your Operating System ($(UNAME)) is not supported by $(PROG_NAME) Makefile")
  endif
  
@@@ -159,13 -160,9 +160,13 @@@ endi
  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
  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
  
 -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
 -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
 - 
 +## 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   $(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   $(CRT_GLOB_64)
 +
  ##
  ## Targets: Global
  ##
@@@ -205,6 -202,11 +206,6 @@@ install: nativ
  	$(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
@@@ -239,10 -241,10 +240,10 @@@ obj/%.LINUX.64.o: src/%.
  	$(CC_LINUX_64) -D_LINUX64 $(CFLAGS_CROSS_LINUX) $(CFLAGS_CROSS_64) -c -o $@ $<
  
  obj/%.WIN.32.o:   src/%.c
 -	$(CC_WIN_32)   -D_WIN32   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_32) -c -o $@ $< 
 +	$(CC_WIN_32)   -D_WIN32   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_32) -c -o $@ $<
  
  obj/%.WIN.64.o:   src/%.c
 -	$(CC_WIN_64)   -D_WIN64   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_64) -c -o $@ $< 
 +	$(CC_WIN_64)   -D_WIN64   $(CFLAGS_CROSS_WIN)   $(CFLAGS_CROSS_64) -c -o $@ $<
  
  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)\"