Mercurial > vim

diff src/Make_cyg_ming.mak @ 16198:b0e19f135e50 v8.1.1104

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1104: MS-Windows: not all environment variables can be used commit https://github.com/vim/vim/commit/796cc42d3a4fc7a940da87831a111eeb6b7a5cf3 Author: Bram Moolenaar <Bram@vim.org> Date: Wed Apr 3 20:31:00 2019 +0200 patch 8.1.1104: MS-Windows: not all environment variables can be used Problem: MS-Windows: not all environment variables can be used. Solution: Use the wide version of WinMain() and main(). (Ken Takata, closes #4206)
author Bram Moolenaar <Bram@vim.org>
date Wed, 03 Apr 2019 20:45:06 +0200
parents 570a296aa0b4
children 1dcbaa780b8e
line wrap: on
line diff
--- a/src/Make_cyg_ming.mak
+++ b/src/Make_cyg_ming.mak
@@ -691,7 +691,7 @@ CFLAGS += -s
 endif
 
 LIB = -lkernel32 -luser32 -lgdi32 -ladvapi32 -lcomdlg32 -lcomctl32 -lnetapi32 -lversion
-GUIOBJ =  $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o $(OUTDIR)/os_w32exe.o
+GUIOBJ =  $(OUTDIR)/gui.o $(OUTDIR)/gui_w32.o $(OUTDIR)/gui_beval.o
 CUIOBJ = $(OUTDIR)/iscygpty.o
 OBJ = \
 	$(OUTDIR)/arabic.o \
@@ -737,9 +737,9 @@ OBJ = \
 	$(OUTDIR)/normal.o \
 	$(OUTDIR)/ops.o \
 	$(OUTDIR)/option.o \
+	$(OUTDIR)/os_mswin.o \
+	$(OUTDIR)/os_w32exe.o \
 	$(OUTDIR)/os_win32.o \
-	$(OUTDIR)/os_mswin.o \
-	$(OUTDIR)/winclip.o \
 	$(OUTDIR)/pathdef.o \
 	$(OUTDIR)/popupmnu.o \
 	$(OUTDIR)/quickfix.o \
@@ -759,6 +759,7 @@ OBJ = \
 	$(OUTDIR)/userfunc.o \
 	$(OUTDIR)/version.o \
 	$(OUTDIR)/vimrc.o \
+	$(OUTDIR)/winclip.o \
 	$(OUTDIR)/window.o
 
 ifdef PERL
@@ -865,6 +866,8 @@ ifdef MZSCHEME
 MZSCHEME_SUFFIX = Z
 endif
 
+LFLAGS += -municode
+
 ifeq ($(GUI),yes)
 TARGET := gvim$(DEBUG_SUFFIX).exe
 DEFINES += $(DEF_GUI)