Try to fix some of the build problems, it still bumms out on:
[obnox/wireshark/wip.git] / wireshark.sln
index c8bf75df7283f88ba16aa89428bdc6e0de07893d..835fe9c14c9e11e8c227fedc9ae514539dcb919b 100644 (file)
@@ -1,6 +1,6 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 9.00\r
-# Visual C++ Express 2005\r
+Microsoft Visual Studio Solution File, Format Version 10.00\r
+# Visual Studio 2008\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ALL", "all.vcproj", "{6B137D16-7235-4BB7-9AE3-8842FB238DD1}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwireshark", "epan\libwireshark.vcproj", "{78DC3973-9100-4C4E-B135-822B623A2EAF}"\r
@@ -9,13 +9,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "docbook", "docbook\docbook.
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "packaging", "packaging.vcproj", "{F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark-gtk1", "wireshark-gtk1.vcproj", "{684AC70D-E5DC-4E42-B70A-DF512A43335C}"\r
-EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark-gtk2", "wireshark-gtk2.vcproj", "{8509897C-1CE1-477D-9FF5-49D7D466F4C9}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wireshark", "wireshark.vcproj", "{684AC70D-E5DC-4E42-B70A-DF512A43335C}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libwiretap", "wiretap\libwiretap.vcproj", "{CD04EABB-BA03-446F-9A63-A00C08138E91}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "gtk\libui.vcproj", "{57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}"\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "ui\gtk\libui.vcproj", "{57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dumpcap", "dumpcap.vcproj", "{D1417D47-E273-4A90-A49B-6BAF4485CA58}"\r
 EndProject\r
@@ -93,18 +91,6 @@ Global
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.zip_gtk1|Win32.Build.0 = Debug|Win32\r
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.zip_gtk2|Win32.ActiveCfg = Debug|Win32\r
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.zip_gtk2|Win32.Build.0 = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Debug|Win32.Build.0 = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.PortableApps|Win32.ActiveCfg = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.PortableApps|Win32.Build.0 = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Release|Win32.ActiveCfg = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.Release|Win32.Build.0 = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.wsdg|Win32.ActiveCfg = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.wsdg|Win32.Build.0 = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk1|Win32.ActiveCfg = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk1|Win32.Build.0 = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk2|Win32.ActiveCfg = Debug|Win32\r
-               {8509897C-1CE1-477D-9FF5-49D7D466F4C9}.zip_gtk2|Win32.Build.0 = Debug|Win32\r
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.PortableApps|Win32.ActiveCfg = Release|Win32\r
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.PortableApps|Win32.Build.0 = Release|Win32\r