From e65e74ae65d553435cd4102dd5f8d1c267ff899c Mon Sep 17 00:00:00 2001
From: SmartSmurf <smartsmurf@shared-files.de>
Date: Mon, 8 Nov 2021 14:52:55 +0100
Subject: [PATCH 1/3] fixed library extension to build properly under CYGWIN

---
 Makefile            |  6 +++---
 suite/fuzz/Makefile | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 826aeb8564..4fd266ed7c 100644
--- a/Makefile
+++ b/Makefile
@@ -377,7 +377,7 @@ endif
 ifeq ($(CAPSTONE_SHARED),yes)
 $(LIBRARY): $(LIBOBJ)
 ifeq ($(V),0)
-	$(call log,LINK,$(@:$(BLDIR)/%=%))
+	$(call log,LINK,$(@:$(BLDIR)/%=%))$(EXT)
 	@$(create-library)
 else
 	$(create-library)
@@ -513,7 +513,7 @@ endif
 
 ifeq ($(CAPSTONE_SHARED),yes)
 define install-library
-	$(INSTALL_LIB) $(LIBRARY) $1
+	$(INSTALL_LIB) $(LIBRARY)$(EXT) $1
 	$(if $(VERSION_EXT),
 		cd $1 && \
 		rm -f lib$(LIBNAME).$(EXT) && \
@@ -532,7 +532,7 @@ endef
 
 
 define create-library
-	$(CC) $(LDFLAGS) $($(LIBNAME)_LDFLAGS) $(LIBOBJ) -o $(LIBRARY)
+	$(CC) $(LDFLAGS) $($(LIBNAME)_LDFLAGS) $(LIBOBJ) -o $(LIBRARY)$(EXT)
 endef
 
 
diff --git a/suite/fuzz/Makefile b/suite/fuzz/Makefile
index 3370df37e5..92a733b532 100644
--- a/suite/fuzz/Makefile
+++ b/suite/fuzz/Makefile
@@ -30,11 +30,17 @@ LDFLAGS += $(foreach arch,$(LIBARCHS),-arch $(arch))
 
 LIBNAME = capstone
 
+IS_CYGWIN := $(shell $(CC) -dumpmachine 2>/dev/null | grep -i cygwin | wc -l)
+ifeq ($(IS_CYGWIN),1)
+EXT = dll
+AR_EXT = lib
+ARCHIVE = $(LIBDIR)/$(LIBNAME).$(AR_EXT)
+else
 BIN_EXT =
 AR_EXT = a
-
-
 ARCHIVE = $(LIBDIR)/lib$(LIBNAME).$(AR_EXT)
+endif
+
 
 .PHONY: all clean
 

From c41cc9d4132b27eb172026bea8944dfea7acf637 Mon Sep 17 00:00:00 2001
From: SmartSmurf <smartsmurf@shared-files.de>
Date: Wed, 10 Nov 2021 15:39:04 +0100
Subject: [PATCH 2/3] fixed fuzzing issue

---
 Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4fd266ed7c..a788e8dcaa 100644
--- a/Makefile
+++ b/Makefile
@@ -340,7 +340,7 @@ ifeq ($(CAPSTONE_SHARED),yes)
 ifeq ($(IS_MINGW),1)
 LIBRARY = $(BLDIR)/$(LIBNAME).$(VERSION_EXT)
 else ifeq ($(IS_CYGWIN),1)
-LIBRARY = $(BLDIR)/$(LIBNAME).$(VERSION_EXT)
+LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
 else	# *nix
 LIBRARY = $(BLDIR)/lib$(LIBNAME).$(VERSION_EXT)
 CFLAGS += -fvisibility=hidden
@@ -377,7 +377,7 @@ endif
 ifeq ($(CAPSTONE_SHARED),yes)
 $(LIBRARY): $(LIBOBJ)
 ifeq ($(V),0)
-	$(call log,LINK,$(@:$(BLDIR)/%=%))$(EXT)
+	$(call log,LINK,$(@:$(BLDIR)/%=%))
 	@$(create-library)
 else
 	$(create-library)
@@ -513,11 +513,11 @@ endif
 
 ifeq ($(CAPSTONE_SHARED),yes)
 define install-library
-	$(INSTALL_LIB) $(LIBRARY)$(EXT) $1
+	$(INSTALL_LIB) $(LIBRARY) $1
 	$(if $(VERSION_EXT),
 		cd $1 && \
 		rm -f lib$(LIBNAME).$(EXT) && \
-		ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT))
+		ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME))
 endef
 else
 define install-library
@@ -532,7 +532,7 @@ endef
 
 
 define create-library
-	$(CC) $(LDFLAGS) $($(LIBNAME)_LDFLAGS) $(LIBOBJ) -o $(LIBRARY)$(EXT)
+	$(CC) $(LDFLAGS) $($(LIBNAME)_LDFLAGS) $(LIBOBJ) -o $(LIBRARY)
 endef
 
 

From 773d425780b6bf398bfc440eea770aca010cfdfd Mon Sep 17 00:00:00 2001
From: Smartsmurf <smartsmurf@shared-files.de>
Date: Wed, 10 Nov 2021 16:22:15 +0100
Subject: [PATCH 3/3] Update Makefile

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a788e8dcaa..55893097f1 100644
--- a/Makefile
+++ b/Makefile
@@ -517,7 +517,7 @@ define install-library
 	$(if $(VERSION_EXT),
 		cd $1 && \
 		rm -f lib$(LIBNAME).$(EXT) && \
-		ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME))
+		ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT))
 endef
 else
 define install-library