DeforaNetworks/hashcat
3
0
Fork 0
Code Releases Activity

Merge pull request #1024 from stephengroat/master

Browse Source 
Adding windows appveyor builds
This commit is contained in:
Jens Steube
2017-02-07 11:44:27 +01:00
committed by GitHub
parent c1f0adebe6 28d37be94a
commit 0993ee8dc5
4 changed files with 72 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Makefile
View File

@@ -277,13 +277,13 @@ OBJS_ALL := affinity autotune benchmark bitmap bitops combinator
NATIVE_STATIC_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.STATIC.o)
NATIVE_SHARED_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).NATIVE.SHARED.o)
ifeq ($(UNAME),CYGWIN)
NATIVE_STATIC_OBJS += $(CRT_GLOB)
endif # CYGWIN
## ifeq ($(UNAME),CYGWIN)
## NATIVE_STATIC_OBJS += $(CRT_GLOB)
## endif # CYGWIN
ifeq ($(UNAME),MSYS2)
NATIVE_STATIC_OBJS += $(CRT_GLOB)
endif # MSYS2
## ifeq ($(UNAME),MSYS2)
## NATIVE_STATIC_OBJS += $(CRT_GLOB)
## endif # MSYS2
LINUX_32_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.32.o)
LINUX_64_OBJS := $(foreach OBJ,$(OBJS_ALL),obj/$(OBJ).LINUX.64.o)
@@ -397,7 +397,7 @@ $(HASHCAT_FRONTEND): src/main.c $(HASHCAT_LIBRARY)
$(CC) $(CFLAGS_NATIVE) $^ -L. -lhashcat $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" -o $@
else
$(HASHCAT_FRONTEND): src/main.c $(NATIVE_STATIC_OBJS)
$(CC) $(CFLAGS_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" -o $@
$(CC) $(CFLAGS_NATIVE) $^ $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" -o $@
endif
##

4
src/main.c
View File

@@ -20,6 +20,10 @@
#include "interface.h"
#include "event.h"
#if defined(__MINGW64__) || defined(__MINGW32__)
int _dowildcard = -1;
#endif
static void main_log_clear_line (MAYBE_UNUSED const int prev_len, MAYBE_UNUSED FILE *fp)
{
#if defined (_WIN)

2
src/win_file_globbing.mk
View File

@@ -104,7 +104,7 @@ ifneq (,$(IS_WIN_BUILD_NATIVE))
# entering this code path means: we need to check for CRT_glob.o since we try to build binaries for windows operating systems
CRT_GLOB := $(shell $(FIND) / -name $(CRT_GLOB_FILE_NAME) -print -quit)
CRT_GLOB := $(CRT_GLOB_FILE_NAME)
ifeq (,$(CRT_GLOB))
define WARNING_MESSAGE=