diff options
| author | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-28 23:36:13 +0000 |
|---|---|---|
| committer | ulfl <ulfl@f5534014-38df-0310-8fa8-9805f1628bb7> | 2007-01-28 23:36:13 +0000 |
| commit | 17930d080ab3d8978cd3ed3808c671a13719a33f (patch) | |
| tree | 20bb3850068858166cda430a8fd5fc2fd0cabaa3 /packaging/u3 | |
| parent | 4e4695ebcd9bf8d824c8994056c061a09d33b20e (diff) | |
add some manifest files (on demand), otherwise u3 package won't work with MSVC!=6 (note that it still might need to provide msvcr*.dll files, I currently don't have a machine to test)
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@20593 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packaging/u3')
| -rw-r--r-- | packaging/u3/win32/makefile.nmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packaging/u3/win32/makefile.nmake b/packaging/u3/win32/makefile.nmake index a446c74a8a..cb22f8811f 100644 --- a/packaging/u3/win32/makefile.nmake +++ b/packaging/u3/win32/makefile.nmake @@ -220,6 +220,7 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util if exist $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll.manifest $(COPY) $(TOPDIR)\wiretap\wiretap-$(WTAP_VERSION).dll.manifest $(HOST) $(COPY_FLAGS) !IFDEF ENABLE_LIBWIRESHARK $(COPY) $(TOPDIR)\epan\libwireshark.dll $(HOST) $(COPY_FLAGS) + if exist $(TOPDIR)\epan\libwireshark.dll.manifest $(COPY) $(TOPDIR)\epan\libwireshark.dll.manifest $(HOST) /d !ENDIF $(COPY) $(GLIB_DIR)\bin\libglib-2.0-0.dll $(HOST) $(COPY_FLAGS) $(COPY) $(GLIB_DIR)\bin\libgmodule-2.0-0.dll $(HOST) $(COPY_FLAGS) @@ -255,6 +256,9 @@ distribution: host-dirs device-dirs data-dirs manifest-dirs manifest.u3i u3util $(COPY) $(TOPDIR)\wireshark-gtk2.exe $(HOST) $(COPY_FLAGS) # can't get /i to work with $(COPY) above to do the rename there mv $(HOST)\wireshark-gtk2.exe $(HOST)\wireshark.exe + if exist $(TOPDIR)\wireshark-gtk2.exe.manifest $(COPY) $(TOPDIR)\wireshark-gtk2.exe.manifest $(HOST) $(COPY_FLAGS) +# can't get /i to work with $(COPY) above to do the rename there + mv $(HOST)\wireshark-gtk2.exe.manifest $(HOST)\wireshark.exe.manifest $(COPY) $(GTK2_DIR)\bin\libgdk-win32-2.0-0.dll $(HOST) $(COPY_FLAGS) $(COPY) $(GTK2_DIR)\bin\libgdk_pixbuf-2.0-0.dll $(HOST) $(COPY_FLAGS) $(COPY) $(GTK2_DIR)\bin\libgtk-win32-2.0-0.dll $(HOST) $(COPY_FLAGS) |