adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

patch 9.1.0640: Mingw: Makefile can be improved

Browse Source 
Problem:  Mingw: Makefile can be improved
Solution: Reduce nesting level, directly check if the '-Wl,--entry'
          option is required (Ken Takata)

closes: #15386

Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Ken Takata
2024-07-29 20:43:21 +02:00
committed by Christian Brabandt
parent 0bee82b1d0
commit 3da011871a
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Make_cyg_ming.mak
View File

@ -1140,8 +1140,8 @@ $(EXEOBJG): | $(OUTDIR)
$(EXEOBJC): | $(OUTDIR) $(EXEOBJC): | $(OUTDIR)
ifeq ($(VIMDLL),yes) ifeq ($(VIMDLL),yes)
ifneq ($(COVERAGE),yes) ifneq ($(findstring -nostdlib,$(EXELFLAGS)),)
ifndef MZSCHEME # -Wl,--entry needs to be specified when -nostdlib is used.
ifeq ($(ARCH),x86-64) ifeq ($(ARCH),x86-64)
EXEENTRYC = -Wl,--entry=wmainCRTStartup EXEENTRYC = -Wl,--entry=wmainCRTStartup
EXEENTRYG = -Wl,--entry=wWinMainCRTStartup EXEENTRYG = -Wl,--entry=wWinMainCRTStartup
@ -1150,7 +1150,6 @@ EXEENTRYC = -Wl,--entry=_wmainCRTStartup
EXEENTRYG = -Wl,--entry=_wWinMainCRTStartup@0 EXEENTRYG = -Wl,--entry=_wWinMainCRTStartup@0
endif endif
endif endif
endif
$(TARGET): $(OBJ) $(TARGET): $(OBJ)
$(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) $(SODIUMLIB) $(LINK) $(CFLAGS) $(LFLAGS) -o $@ $(OBJ) $(LIB) -lole32 -luuid -lgdi32 $(LUA_LIB) $(MZSCHEME_LIBDIR) $(MZSCHEME_LIB) $(PYTHONLIB) $(PYTHON3LIB) $(RUBYLIB) $(SODIUMLIB)

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
640,
/**/ /**/
639, 639,
/**/ /**/