Hi,
I have attached the diff of my vim build directory against vim70src.zip.
Note that I added a few manifests, e.g. to install.exe, on the command
line, and aren't included in the diff.
The diff only shows the changes I made to create a vim build on _my_
box. Your mileage may, and quite likely will, vary.
Ron
diff -urN vim70-x86_32/src/gvim.exe.mnf vim70-x86_64/src/gvim.exe.mnf
--- vim70-x86_32/src/gvim.exe.mnf 2006-05-07 15:13:04.000000000 +0100
+++ vim70-x86_64/src/gvim.exe.mnf 2006-05-08 16:05:27.468750000 +0100
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity
- processorArchitecture="X86"
- version="6.2.0.0"
- type="win32"
- name="Vim"
- />
- <description>Vi Improved - A Text Editor</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- processorArchitecture="X86"
- />
- </dependentAssembly>
- </dependency>
-</assembly>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+processorArchitecture="AMD64"
+version="7.0.0.0"
+type="win32"
+name="Vim"
+/>
+<description>Vi Improved - A Text Editor</description>
+<dependency>
+<dependentAssembly>
+<assemblyIdentity
+type="win32"
+name="Microsoft.Windows.Common-Controls"
+version="6.0.0.0"
+publicKeyToken="6595b64144ccf1df"
+language="*"
+processorArchitecture="AMD64"
+/>
+</dependentAssembly>
+</dependency>
+</assembly>
diff -urN vim70-x86_32/src/GvimExt/gvimext.dll.manifest
vim70-x86_64/src/GvimExt/gvimext.dll.manifest
--- vim70-x86_32/src/GvimExt/gvimext.dll.manifest 1970-01-01
00:00:00.000000000 +0000
+++ vim70-x86_64/src/GvimExt/gvimext.dll.manifest 2006-05-09
19:51:55.390625000 +0100
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT'
version='8.0.50608.0' processorArchitecture='AMD64'
publicKeyToken='1fc8b3b9a1e18e3b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff -urN vim70-x86_32/src/if_perl.xs vim70-x86_64/src/if_perl.xs
--- vim70-x86_32/src/if_perl.xs 2006-05-07 15:13:06.000000000 +0100
+++ vim70-x86_64/src/if_perl.xs 2006-05-07 22:50:06.359375000 +0100
@@ -155,8 +155,8 @@
static int (*perl_run)(PerlInterpreter*);
static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**);
static void* (*Perl_get_context)(void);
-static void (*Perl_croak)(pTHX_ const char*, ...) __attribute__((noreturn));
-static void (*Perl_croak_nocontext)(const char*, ...)
__attribute__((noreturn));
+static void (*Perl_croak)(pTHX_ const char*, ...);
+static void (*Perl_croak_nocontext)(const char*, ...);
static I32 (*Perl_dowantarray)(pTHX);
static void (*Perl_free_tmps)(pTHX);
static HV* (*Perl_gv_stashpv)(pTHX_ const char*, I32);
diff -urN vim70-x86_32/src/Make_mvc.mak vim70-x86_64/src/Make_mvc.mak
--- vim70-x86_32/src/Make_mvc.mak 2006-05-07 15:13:02.000000000 +0100
+++ vim70-x86_64/src/Make_mvc.mak 2006-05-08 16:10:33.093750000 +0100
@@ -284,7 +284,7 @@
# need shell32.lib for ExtractIcon()
# gdi32.lib and comdlg32.lib for printing support
# ole32.lib and uuid.lib are needed for FEAT_SHORTCUT
-CON_LIB = advapi32.lib shell32.lib gdi32.lib comdlg32.lib ole32.lib uuid.lib
+CON_LIB = advapi32.lib shell32.lib gdi32.lib comdlg32.lib ole32.lib uuid.lib
bufferoverflowU.lib
!if "$(DELAYLOAD)" == "yes"
CON_LIB = $(CON_LIB) /DELAYLOAD:comdlg32.dll /DELAYLOAD:ole32.dll DelayImp.lib
!endif
@@ -322,15 +322,15 @@
# Convert processor ID to MVC-compatible number
!if "$(CPUNR)" == "i386"
-CPUARG = /G3
+CPUARG =
!elseif "$(CPUNR)" == "i486"
-CPUARG = /G4
+CPUARG =
!elseif "$(CPUNR)" == "i586"
-CPUARG = /G5
+CPUARG =
!elseif "$(CPUNR)" == "i686"
-CPUARG = /G6
+CPUARG =
!elseif "$(CPUNR)" == "pentium4"
-CPUARG = /G7 /arch:SSE2
+CPUARG = /arch:SSE2
!else
CPUARG =
!endif
@@ -338,11 +338,11 @@
!ifdef NODEBUG
VIM = vim
!if "$(OPTIMIZE)" == "SPACE"
-OPTFLAG = /O1
+OPTFLAG = /O1 /GF /GL
!elseif "$(OPTIMIZE)" == "SPEED"
-OPTFLAG = /O2
+OPTFLAG = /O2 /GF /GL
!else # MAXSPEED
-OPTFLAG = /Ox
+OPTFLAG = /Ox /GF /GL
!endif
CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
RCFLAGS = $(rcflags) $(rcvars) -DNDEBUG
@@ -702,7 +702,7 @@
conflags = $(conflags) /map /mapinfo:lines
!ENDIF
-LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc
+LINKARGS1 = $(linkdebug) $(conflags) /nodefaultlib:libc /LTCG
LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(LIBC) $(OLE_LIB) user32.lib $(SNIFF_LIB) \
$(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(RUBY_LIB) \
$(TCL_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(LINK_PDB)
@@ -726,15 +726,15 @@
install.exe: dosinst.c
$(CC) /nologo -DNDEBUG -DWIN32 dosinst.c kernel32.lib shell32.lib \
- ole32.lib advapi32.lib uuid.lib
+ ole32.lib advapi32.lib uuid.lib bufferoverflowU.lib
- if exist install.exe del install.exe
ren dosinst.exe install.exe
uninstal.exe: uninstal.c
- $(CC) /nologo -DNDEBUG -DWIN32 uninstal.c shell32.lib advapi32.lib
+ $(CC) /nologo -DNDEBUG -DWIN32 uninstal.c shell32.lib advapi32.lib
bufferoverflowU.lib
vimrun.exe: vimrun.c
- $(CC) /nologo -DNDEBUG vimrun.c
+ $(CC) /nologo -DNDEBUG vimrun.c bufferoverflowU.lib
xxd/xxd.exe: xxd/xxd.c
cd xxd
@@ -943,7 +943,7 @@
$(OUTDIR)/xpm_w32.obj: $(OUTDIR) xpm_w32.c
$(CC) $(CFLAGS) $(XPM_INC) xpm_w32.c
-$(OUTDIR)/vim.res: $(OUTDIR) gvim.exe.mnf vim.rc version.h tools.bmp
tearoff.bmp \
+$(OUTDIR)/vim.res: $(OUTDIR) vim.exe.mnf gvim.exe.mnf vim.rc version.h
tools.bmp tearoff.bmp \
vim.ico vim_error.ico vim_alert.ico vim_info.ico vim_quest.ico
$(RC) /l 0x409 /Fo$(OUTDIR)/vim.res $(RCFLAGS) vim.rc
diff -urN vim70-x86_32/src/vim.exe.manifest vim70-x86_64/src/vim.exe.manifest
--- vim70-x86_32/src/vim.exe.manifest 1970-01-01 00:00:00.000000000 +0000
+++ vim70-x86_64/src/vim.exe.manifest 2006-05-08 16:02:45.140625000 +0100
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT'
version='8.0.50608.0' processorArchitecture='AMD64'
publicKeyToken='1fc8b3b9a1e18e3b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff -urN vim70-x86_32/src/vim.exe.mnf vim70-x86_64/src/vim.exe.mnf
--- vim70-x86_32/src/vim.exe.mnf 1970-01-01 00:00:00.000000000 +0000
+++ vim70-x86_64/src/vim.exe.mnf 2006-06-06 11:42:25.578125000 +0100
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <dependency>
+ <dependentAssembly>
+ <assemblyIdentity type='win32' name='Microsoft.VC80.CRT'
version='8.0.50608.0' processorArchitecture='AMD64'
publicKeyToken='1fc8b3b9a1e18e3b' />
+ </dependentAssembly>
+ </dependency>
+</assembly>
diff -urN vim70-x86_32/src/vim.rc vim70-x86_64/src/vim.rc
--- vim70-x86_32/src/vim.rc 2006-05-07 15:13:04.000000000 +0100
+++ vim70-x86_64/src/vim.rc 2006-05-07 23:29:58.406250000 +0100
@@ -46,6 +46,15 @@
#endif
CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "gvim.exe.mnf"
+#else // !FEAT_GUI_W32
+#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID
+# define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+#endif
+#ifndef RT_MANIFEST
+# define RT_MANIFEST 24
+#endif
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "vim.exe.mnf"
#endif // FEAT_GUI_W32
//
diff -urN vim70-x86_32/src/xxd/Make_mvc.mak vim70-x86_64/src/xxd/Make_mvc.mak
--- vim70-x86_32/src/xxd/Make_mvc.mak 2006-05-07 15:12:46.000000000 +0100
+++ vim70-x86_64/src/xxd/Make_mvc.mak 2006-05-08 16:08:50.640625000 +0100
@@ -4,11 +4,11 @@
xxd: xxd.exe
xxd.exe: xxd.c
- cl /nologo -DWIN32 xxd.c
+ cl /nologo -DWIN32 xxd.c bufferoverflowU.lib
# This was for an older compiler
# cl /nologo -DWIN32 xxd.c /link setargv.obj
clean:
- - if exist xxd.obj del xxd.obj
- - if exist xxd.exe del xxd.exe
+ - if exist xxd.obj del xxd.obj
+ - if exist xxd.exe del xxd.exe
