start to remove gtk1 from the Visual Studio stuff

svn path=/trunk/; revision=24786

3 files changed, 4 insertions, 81 deletions

diff --git a/wireshark-gtk2.vcproj b/wireshark-gtk2.vcproj
deleted file mode 100644
index adf9096c00..0000000000
--- a/wireshark-gtk2.vcproj
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>

-<VisualStudioProject

-	ProjectType="Visual C++"

-	Version="8,00"

-	Name="wireshark-gtk2"

-	ProjectGUID="{8509897C-1CE1-477D-9FF5-49D7D466F4C9}"

-	RootNamespace="wireshark-gtk2"

-	Keyword="MakeFileProj"

-	>

-	<Platforms>

-		<Platform

-			Name="Win32"

-		/>

-	</Platforms>

-	<ToolFiles>

-	</ToolFiles>

-	<Configurations>

-		<Configuration

-			Name="Debug|Win32"

-			OutputDirectory="$(ConfigurationName)"

-			IntermediateDirectory="$(ConfigurationName)"

-			ConfigurationType="0"

-			>

-			<Tool

-				Name="VCNMakeTool"

-				BuildCommandLine="nmake -f Makefile.nmake debug-gtk2"

-				ReBuildCommandLine=""

-				CleanCommandLine=""

-				Output="wireshark-gtk2\wireshark.exe"

-				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"

-				IncludeSearchPath=""

-				ForcedIncludes=""

-				AssemblySearchPath=""

-				ForcedUsingAssemblies=""

-				CompileAsManaged=""

-			/>

-		</Configuration>

-	</Configurations>

-	<References>

-	</References>

-	<Files>

-		<Filter

-			Name="Source Files"

-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"

-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

-			>

-		</Filter>

-		<Filter

-			Name="Header Files"

-			Filter="h;hpp;hxx;hm;inl;inc;xsd"

-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

-			>

-		</Filter>

-		<Filter

-			Name="Resourcen Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

-	</Files>

-	<Globals>

-	</Globals>

-</VisualStudioProject>

diff --git a/wireshark.sln b/wireshark.sln
index c8bf75df72..f2672f0112 100644
--- a/wireshark.sln
+++ b/wireshark.sln
@@ -9,9 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docbook", "docbook\docbook.
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "packaging", "packaging.vcproj", "{F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark-gtk1", "wireshark-gtk1.vcproj", "{684AC70D-E5DC-4E42-B70A-DF512A43335C}"

-EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark-gtk2", "wireshark-gtk2.vcproj", "{8509897C-1CE1-477D-9FF5-49D7D466F4C9}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark", "wireshark.vcproj", "{684AC70D-E5DC-4E42-B70A-DF512A43335C}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwiretap", "wiretap\libwiretap.vcproj", "{CD04EABB-BA03-446F-9A63-A00C08138E91}"

 EndProject

@@ -93,18 +91,6 @@ Global
 		{684AC70D-E5DC-4E42-B70A-DF512A43335C}.zip_gtk1|Win32.Build.0 = Debug|Win32

 		{684AC70D-E5DC-4E42-B70A-DF512A43335C}.zip_gtk2|Win32.ActiveCfg = Debug|Win32

 		{684AC70D-E5DC-4E42-B70A-DF512A43335C}.zip_gtk2|Win32.Build.0 = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Debug|Win32.ActiveCfg = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Debug|Win32.Build.0 = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.PortableApps|Win32.ActiveCfg = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.PortableApps|Win32.Build.0 = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Release|Win32.ActiveCfg = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Release|Win32.Build.0 = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.wsdg|Win32.ActiveCfg = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.wsdg|Win32.Build.0 = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk1|Win32.ActiveCfg = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk1|Win32.Build.0 = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk2|Win32.ActiveCfg = Debug|Win32

-		{8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk2|Win32.Build.0 = Debug|Win32

 		{CD04EABB-BA03-446F-9A63-A00C08138E91}.Debug|Win32.ActiveCfg = Debug|Win32

 		{CD04EABB-BA03-446F-9A63-A00C08138E91}.PortableApps|Win32.ActiveCfg = Release|Win32

 		{CD04EABB-BA03-446F-9A63-A00C08138E91}.PortableApps|Win32.Build.0 = Release|Win32

diff --git a/wireshark-gtk1.vcproj b/wireshark.vcproj
index 70aa9415ca..def4011f02 100644
--- a/wireshark-gtk1.vcproj
+++ b/wireshark.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8,00"

-	Name="wireshark-gtk1"

+	Name="wireshark"

 	ProjectGUID="{684AC70D-E5DC-4E42-B70A-DF512A43335C}"

 	RootNamespace="wireshark"

 	Keyword="MakeFileProj"

@@ -23,10 +23,10 @@
 			>

 			<Tool

 				Name="VCNMakeTool"

-				BuildCommandLine="nmake -f Makefile.nmake debug-gtk1"

+				BuildCommandLine="nmake -f Makefile.nmake debug"

 				ReBuildCommandLine=""

 				CleanCommandLine="nmake -f Makefile.nmake distclean"

-				Output="wireshark-gtk1\wireshark.exe"

+				Output="wireshark-gtk2\wireshark.exe"

 				PreprocessorDefinitions="WIN32;_DEBUG;HAVE_CONFIG_H"

 				IncludeSearchPath=""

 				ForcedIncludes=""