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/Makefile.nmake | |
| 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/Makefile.nmake')
| -rw-r--r-- | image/Makefile.nmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/image/Makefile.nmake b/image/Makefile.nmake index e0b929fdc8..adddb9a1c0 100644 --- a/image/Makefile.nmake +++ b/image/Makefile.nmake @@ -13,6 +13,7 @@ wireshark.exe.manifest: wireshark.exe.manifest.in ..\config.nmake sed -e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \ -e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \ -e s/@VERSION_MICRO@/$(VERSION_MICRO)/ \ + -e s/@PROCESSOR_ARCHITECTURE@/$(PROCESSOR_ARCHITECTURE)/ \ < wireshark.exe.manifest.in > $@ wireshark.rc : file_dlg_win32.rc wireshark.rc.in wireshark.exe.manifest ..\config.nmake |