diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-29 04:05:27 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-29 04:05:27 +0000 |
| commit | ba49d9bcf01a597ebec66c3d65c4813ebf174806 (patch) | |
| tree | 24a8dc06b7825a9b8d252a148eeb0809d75201e6 /packaging.vcproj | |
| parent | 58d01512b16728b357b2f6481c592a71c7ab8435 (diff) | |
| download | wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.tar.gz | |
Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.
svn path=/trunk/; revision=52941
Diffstat (limited to 'packaging.vcproj')
| -rw-r--r-- | packaging.vcproj | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/packaging.vcproj b/packaging.vcproj index f30af6662d..38131b2dbd 100644 --- a/packaging.vcproj +++ b/packaging.vcproj @@ -37,6 +37,26 @@ /> </Configuration> <Configuration + Name="U3|Win32" + OutputDirectory="$(ConfigurationName)" + IntermediateDirectory="$(ConfigurationName)" + ConfigurationType="0" + > + <Tool + Name="VCNMakeTool" + BuildCommandLine="nmake -f Makefile.nmake packaging" + ReBuildCommandLine="" + CleanCommandLine="" + Output="" + PreprocessorDefinitions="WIN32;NDEBUG" + IncludeSearchPath="" + ForcedIncludes="" + AssemblySearchPath="" + ForcedUsingAssemblies="" + CompileAsManaged="" + /> + </Configuration> + <Configuration Name="zip_gtk1|Win32" OutputDirectory="$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" @@ -101,6 +121,58 @@ </References> <Files> <Filter + Name="u3.win32" + > + <File + RelativePath=".\packaging\u3\win32\makefile.nmake" + > + </File> + <File + RelativePath=".\packaging\u3\win32\manifest.tmpl" + > + </File> + <File + RelativePath=".\packaging\u3\win32\README.txt" + > + </File> + <File + RelativePath=".\packaging\u3\win32\u3util.c" + > + </File> + </Filter> + <Filter + Name="u3.tools" + > + <File + RelativePath=".\packaging\u3\tools\makefile.nmake" + > + </File> + <File + RelativePath=".\packaging\u3\tools\README.txt" + > + </File> + <File + RelativePath=".\packaging\u3\tools\sysdep.c" + > + </File> + <File + RelativePath=".\packaging\u3\tools\sysdep.h" + > + </File> + <File + RelativePath=".\packaging\u3\tools\utest.c" + > + </File> + <File + RelativePath=".\packaging\u3\tools\uuid.c" + > + </File> + <File + RelativePath=".\packaging\u3\tools\uuid.h" + > + </File> + </Filter> + <Filter Name="nsis" > <File |