Mercurial > vim

changeset 7566:1dd5b27a79b1 v7.4.1083

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/4514d2769b05faf6edcca42c3ab3d42da84270f1 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jan 10 19:21:36 2016 +0100 patch 7.4.1083 Problem: Building GvimExt with VS2015 may fail. Solution: Adjust the makefile. (Mike Williams)
author Christian Brabandt <cb@256bit.org>
date Sun, 10 Jan 2016 19:30:04 +0100
parents 94d9eb648d4f
children 45c2189b7d48
files src/GvimExt/Makefile src/version.c
diffstat 2 files changed, 26 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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,