patch 9.1.0637: MS-Windows: Style issues in MSVC Makefile

Problem:  MS-Windows: Style issues in MSVC Makefile
Solution: Fix style issues, simplify logic
          (Ken Takata)

* Add space around the operators for consistency.
* Remove unnecessary ren command. Use the /Fe option to create
  install.exe directly.
* Remove unnecessary mkdir auto command. src/auto should always exist.

closes: #15389

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 19:52:03 +02:00
committed by Christian Brabandt
parent f4572cee35
commit 81a65000c5
2 changed files with 26 additions and 29 deletions

View File

@ -960,12 +960,10 @@ LUA_LIB = "$(LUA)\lib\lua$(LUA_VER).lib"
! endif ! endif
!endif !endif
!ifdef PYTHON !if defined(PYTHON) && defined(PYTHON3)
! ifdef PYTHON3
DYNAMIC_PYTHON = yes DYNAMIC_PYTHON = yes
DYNAMIC_PYTHON3 = yes DYNAMIC_PYTHON3 = yes
!endif !endif
!endif
# PYTHON interface # PYTHON interface
!ifdef PYTHON !ifdef PYTHON
@ -1348,11 +1346,9 @@ CFLAGS_INST= $(CFLAGS_INST) -DVIM_VERSION_PATCHLEVEL=$(PATCHLEVEL)
!ENDIF !ENDIF
install.exe: dosinst.c dosinst.h version.h install.exe: dosinst.c dosinst.h version.h
$(CC) $(CFLAGS_INST) dosinst.c kernel32.lib shell32.lib \ $(CC) $(CFLAGS_INST) /Fe$@ dosinst.c kernel32.lib shell32.lib \
user32.lib ole32.lib advapi32.lib uuid.lib \ user32.lib ole32.lib advapi32.lib uuid.lib \
-link -subsystem:$(SUBSYSTEM_TOOLS) -link -subsystem:$(SUBSYSTEM_TOOLS)
- if exist install.exe del install.exe
ren dosinst.exe install.exe
uninstall.exe: uninstall.c dosinst.h version.h uninstall.exe: uninstall.c dosinst.h version.h
$(CC) $(CFLAGS_INST) uninstall.c shell32.lib advapi32.lib \ $(CC) $(CFLAGS_INST) uninstall.c shell32.lib advapi32.lib \
@ -1632,7 +1628,6 @@ $(OUTDIR)/if_lua.obj: $(OUTDIR) if_lua.c $(INCL)
$(CC) $(CFLAGS_OUTDIR) $(LUA_INC) if_lua.c $(CC) $(CFLAGS_OUTDIR) $(LUA_INC) if_lua.c
auto/if_perl.c: if_perl.xs typemap auto/if_perl.c: if_perl.xs typemap
-if not exist auto/nul mkdir auto
$(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \ $(XSUBPP) -prototypes -typemap $(XSUBPP_TYPEMAP) \
-typemap typemap if_perl.xs -output $@ -typemap typemap if_perl.xs -output $@

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 */
/**/
637,
/**/ /**/
636, 636,
/**/ /**/