Merge branch 'next' of https://github.com/aquynh/capstone into next
diff --git a/cstool/Makefile b/cstool/Makefile
index 450ac1b..e66def8 100644
--- a/cstool/Makefile
+++ b/cstool/Makefile
@@ -13,9 +13,21 @@
SOURCES := $(wildcard *.c)
OBJECTS := $(SOURCES:.c=.o)
+AR_EXT = a
+
+IS_CYGWIN := $(shell $(CC) -dumpmachine 2>/dev/null | grep -i cygwin | wc -l)
+ifeq ($(IS_CYGWIN),1)
+AR_EXT = lib
+else
+IS_MINGW := $(shell $(CC) --version 2>/dev/null | grep -i mingw | wc -l)
+ifeq ($(IS_MINGW),1)
+AR_EXT = lib
+endif
+endif
+
all: $(TARGET)
-$(TARGET): $(OBJECTS)
+$(TARGET): ../libcapstone.$(AR_EXT) $(OBJECTS)
ifeq ($(V),0)
$(call log,LINK,$@)
@${CC} $(OBJECTS) $(LDFLAGS) -o $@