k-takata

diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -2,11 +2,8 @@
 
 #define WIN32_LEAN_AND_MEAN
 
-#ifdef __MINGW32__
-# undef WINVER
-# define WINVER 0x0600

k-takata

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -8,6 +8,7 @@
 # Cygwin application use the Makefile (just like on Unix).
 #
 # GUI		no or yes: set to yes if you want the GUI version (yes)
+# DIRECTX	no or yes: set to yes if you want use DirectWrite (no)
 # PERL		define to path to Perl dir to get Perl support (not defined)
 #   PERL_VER	  define to version of Perl being used (56)

k-takata

diff --git a/src/gui_w32.c b/src/gui_w32.c
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -2480,12 +2480,12 @@
     if (enc_utf8)
     {
 #if defined(USE_DIRECT_X)
-	n = len - 1; /* always output the text as WCHAR */
-#else
-	for (n = 0; n < len; ++n)

k-takata

diff --git a/src/gui_dwrite.cpp b/src/gui_dwrite.cpp
--- a/src/gui_dwrite.cpp
+++ b/src/gui_dwrite.cpp
@@ -14,6 +14,10 @@
 
 #include "gui_dwrite.h"
 
+extern "C" {
+#include "vim.h"
+}

k-takata

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -628,6 +628,9 @@
 $(OUTDIR)/gui_dwrite.o:	gui_dwrite.cpp $(INCL) gui_dwrite.h
 	$(CXX) -c $(CFLAGS) gui_dwrite.cpp -o $(OUTDIR)/gui_dwrite.o
 
+$(OUTDIR)/gui_w32.o:	gui_w32.c gui_w48.c $(INCL)
+	$(CC) -c $(CFLAGS) gui_w32.c -o $(OUTDIR)/gui_w32.o
+

k-takata

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -117,6 +117,13 @@
 OPTIMIZE = MAXSPEED
 endif
 
+
+# Link against the shared version of libstdc++ by default.  Set
+# STATIC_STDCPLUS to "yes" to link against static version instead.

k-takata

diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -92,12 +92,6 @@
 ifndef DIRECTX
 DIRECTX = no
 endif
-ifeq ($(DIRECTX),yes)
-# DirectWrite requires that WINVER is 0x0600 or above
-ifndef WINVER

k-takata

diff --git a/src/gui_w32.c b/src/gui_w32.c
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -50,7 +50,7 @@
 }
 #endif
 
-#ifdef FEAT_RENDERING_OPTIONS
+#if defined(FEAT_RENDERING_OPTIONS) || defined(PROTO)
     int

k-takata

#
# Makefile for VIM on Win32, using Cygwin gcc-3 or MinGW cross compiler
# Last updated by Ken Takata.  Last Change: 2013 Feb 23
#
# Also read INSTALLpc.txt!
#
# This compiles Vim as a Windows application.  If you want Vim to run as a
# Cygwin application use the Makefile (just like on Unix).
#
# The old Make_cyg.mak (maintained by Dan Sharp et al.) was merged into

k-takata

Build The Silver Searcher

the silver searcher

For Win32/64 using MSYS2

Install Packages

Install the following packages using pacman -S package-name: