diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-10 19:21:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-10 19:21:36 +0100 |
| commit | 4514d2769b05faf6edcca42c3ab3d42da84270f1 (patch) | |
| tree | dda29746fcfc7a4502070dcbb189118339f09848 | |
| parent | 858b96f382eeb8f1eab5100639e7b09523a6a2a1 (diff) | |
| download | vim-git-4514d2769b05faf6edcca42c3ab3d42da84270f1.tar.gz | |
patch 7.4.1083v7.4.1083
Problem: Building GvimExt with VS2015 may fail.
Solution: Adjust the makefile. (Mike Williams)
| -rw-r--r-- | src/GvimExt/Makefile | 32 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/GvimExt/Makefile b/src/GvimExt/Makefile index 16b17345d..b45198144 100644 --- a/src/GvimExt/Makefile +++ b/src/GvimExt/Makefile @@ -12,6 +12,22 @@ APPVER=5.0 NODEBUG = 1 !endif +!ifdef PROCESSOR_ARCHITECTURE +# On Windows NT +! ifndef CPU +CPU = i386 +! ifdef PLATFORM +! if ("$(PLATFORM)" == "x64") || ("$(PLATFORM)" == "X64") +CPU = AMD64 +! elseif ("$(PLATFORM)" != "x86") && ("$(PLATFORM)" != "X86") +! error *** ERROR Unknown target platform "$(PLATFORM)". Make aborted. +! endif +! endif +! endif +!else +CPU = i386 +!endif + !ifdef SDK_INCLUDE_DIR !include $(SDK_INCLUDE_DIR)\Win32.mak !else @@ -30,15 +46,15 @@ gvimext.dll: gvimext.obj \ gvimext.obj: gvimext.h .cpp.obj: - $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp + $(cc) $(cflags) -DFEAT_GETTEXT $(cvarsmt) $*.cpp gvimext.res: gvimext.rc - $(rc) $(rcflags) $(rcvars) gvimext.rc + $(rc) $(rcflags) $(rcvars) gvimext.rc clean: - - if exist gvimext.dll del gvimext.dll - - if exist gvimext.lib del gvimext.lib - - if exist gvimext.exp del gvimext.exp - - if exist gvimext.obj del gvimext.obj - - if exist gvimext.res del gvimext.res - - if exist gvimext.dll.manifest del gvimext.dll.manifest + - if exist gvimext.dll del gvimext.dll + - if exist gvimext.lib del gvimext.lib + - if exist gvimext.exp del gvimext.exp + - if exist gvimext.obj del gvimext.obj + - if exist gvimext.res del gvimext.res + - if exist gvimext.dll.manifest del gvimext.dll.manifest diff --git a/src/version.c b/src/version.c index f1e2b05b5..b0a3a938f 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1083, +/**/ 1082, /**/ 1081, |