Skip to content

Commit 4514d27

Browse files
committed
patch 7.4.1083
Problem: Building GvimExt with VS2015 may fail. Solution: Adjust the makefile. (Mike Williams)
1 parent 858b96f commit 4514d27

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

src/GvimExt/Makefile

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@ APPVER=5.0
1212
NODEBUG = 1
1313
!endif
1414

15+
!ifdef PROCESSOR_ARCHITECTURE
16+
# On Windows NT
17+
! ifndef CPU
18+
CPU = i386
19+
! ifdef PLATFORM
20+
! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64")
21+
CPU = AMD64
22+
! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86")
23+
! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted.
24+
! endif
25+
! endif
26+
! endif
27+
!else
28+
CPU = i386
29+
!endif
30+
1531
!ifdef SDK_INCLUDE_DIR
1632
!include $(SDK_INCLUDE_DIR)\Win32.mak
1733
!else
@@ -30,15 +46,15 @@ gvimext.dll: gvimext.obj \
3046
gvimext.obj: gvimext.h
3147

3248
.cpp.obj:
33-
$(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
49+
$(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp
3450

3551
gvimext.res: gvimext.rc
36-
$(rc) $(rcflags) $(rcvars) gvimext.rc
52+
$(rc) $(rcflags) $(rcvars) gvimext.rc
3753

3854
clean:
39-
- if exist gvimext.dll del gvimext.dll
40-
- if exist gvimext.lib del gvimext.lib
41-
- if exist gvimext.exp del gvimext.exp
42-
- if exist gvimext.obj del gvimext.obj
43-
- if exist gvimext.res del gvimext.res
44-
- if exist gvimext.dll.manifest del gvimext.dll.manifest
55+
- if exist gvimext.dll del gvimext.dll
56+
- if exist gvimext.lib del gvimext.lib
57+
- if exist gvimext.exp del gvimext.exp
58+
- if exist gvimext.obj del gvimext.obj
59+
- if exist gvimext.res del gvimext.res
60+
- if exist gvimext.dll.manifest del gvimext.dll.manifest

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1083,
744746
/**/
745747
1082,
746748
/**/

0 commit comments

Comments
 (0)