diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-01-28 00:21:05 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-01-28 00:21:05 +0000 |
| commit | 5d4685632076ca7d1155783006d581c4584bf820 (patch) | |
| tree | 7853ee0fb3c3c2e7117762f10e43e251b31ae3bc /image/wireshark.exe.manifest.in | |
| parent | 624ebe8464a766c07880c434226ddf85fc09e1e6 (diff) | |
| download | wireshark-5d4685632076ca7d1155783006d581c4584bf820.tar.gz wireshark-5d4685632076ca7d1155783006d581c4584bf820.tar.bz2 wireshark-5d4685632076ca7d1155783006d581c4584bf820.zip | |
Use the correct processor architecture in our manifest. This lets us
create a usable wireshark.exe for x64 using Visual C++ 10. Change the
name of VCREDIST_DLL to PROCESSOR_ARCHITECTURE to more accurately
reflect what it's used for. Allow MSVC_VARIANT to be set from the
system environment, mainly to keep me from accidentally clobbering it
in the future.
svn path=/trunk/; revision=35687
Diffstat (limited to 'image/wireshark.exe.manifest.in')
| -rw-r--r-- | image/wireshark.exe.manifest.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/image/wireshark.exe.manifest.in b/image/wireshark.exe.manifest.in index 5968ede549..357dc47b97 100644 --- a/image/wireshark.exe.manifest.in +++ b/image/wireshark.exe.manifest.in @@ -2,7 +2,7 @@ <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assemblyIdentity version="@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.0" - processorArchitecture="X86" + processorArchitecture="@PROCESSOR_ARCHITECTURE@" name="WiresharkDevelopmentTeam.Wireshark" type="win32" /> @@ -13,7 +13,7 @@ type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" - processorArchitecture="X86" + processorArchitecture="@PROCESSOR_ARCHITECTURE@" publicKeyToken="6595b64144ccf1df" language="*" /> |