Update Makefile

This commit is contained in:
Stephen
2017-02-06 16:00:00 -08:00
committed by GitHub
parent 0abf79de4d
commit 7826906f58
+7 -7
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) $^ $(CRT_GLOB) $(LFLAGS_NATIVE) -DCOMPTIME=$(COMPTIME) -DVERSION_TAG=\"$(VERSION_TAG)\" -DINSTALL_FOLDER=\"$(INSTALL_FOLDER)\" -DSHARED_FOLDER=\"$(SHARED_FOLDER)\" -DDOCUMENT_FOLDER=\"$(DOCUMENT_FOLDER)\" -o $@
endif
##