Try to fix some of the build problems, it still bumms out on:
[obnox/wireshark/wip.git] / wireshark.sln
index 836a4b97d464663713ee2027aa9b9104489cf543..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
@@ -30,6 +28,7 @@ EndProject
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
+               PortableApps|Win32 = PortableApps|Win32\r
                Release|Win32 = Release|Win32\r
                wsdg|Win32 = wsdg|Win32\r
                zip_gtk1|Win32 = zip_gtk1|Win32\r
@@ -37,6 +36,8 @@ Global
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.PortableApps|Win32.ActiveCfg = Debug|Win32\r
+               {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.PortableApps|Win32.Build.0 = Debug|Win32\r
                {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.Release|Win32.ActiveCfg = Debug|Win32\r
                {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.Release|Win32.Build.0 = Debug|Win32\r
                {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.wsdg|Win32.ActiveCfg = Debug|Win32\r
@@ -46,6 +47,8 @@ Global
                {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.zip_gtk2|Win32.ActiveCfg = Debug|Win32\r
                {6B137D16-7235-4BB7-9AE3-8842FB238DD1}.zip_gtk2|Win32.Build.0 = Debug|Win32\r
                {78DC3973-9100-4C4E-B135-822B623A2EAF}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {78DC3973-9100-4C4E-B135-822B623A2EAF}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {78DC3973-9100-4C4E-B135-822B623A2EAF}.PortableApps|Win32.Build.0 = Release|Win32\r
                {78DC3973-9100-4C4E-B135-822B623A2EAF}.Release|Win32.ActiveCfg = Release|Win32\r
                {78DC3973-9100-4C4E-B135-822B623A2EAF}.Release|Win32.Build.0 = Release|Win32\r
                {78DC3973-9100-4C4E-B135-822B623A2EAF}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -55,6 +58,8 @@ Global
                {78DC3973-9100-4C4E-B135-822B623A2EAF}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {78DC3973-9100-4C4E-B135-822B623A2EAF}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.Debug|Win32.ActiveCfg = wsug|Win32\r
+               {36D0C052-05E5-4220-9451-5E907DFE7BC4}.PortableApps|Win32.ActiveCfg = wsdg|Win32\r
+               {36D0C052-05E5-4220-9451-5E907DFE7BC4}.PortableApps|Win32.Build.0 = wsdg|Win32\r
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.Release|Win32.ActiveCfg = wsdg|Win32\r
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.Release|Win32.Build.0 = wsdg|Win32\r
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.wsdg|Win32.ActiveCfg = wsdg|Win32\r
@@ -63,16 +68,21 @@ Global
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.zip_gtk1|Win32.Build.0 = wsdg|Win32\r
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.zip_gtk2|Win32.ActiveCfg = wsdg|Win32\r
                {36D0C052-05E5-4220-9451-5E907DFE7BC4}.zip_gtk2|Win32.Build.0 = wsdg|Win32\r
-               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.Debug|Win32.ActiveCfg = nsis|Win32\r
+               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.Debug|Win32.ActiveCfg = PortableApps|Win32\r
+               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.Debug|Win32.Build.0 = PortableApps|Win32\r
+               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.PortableApps|Win32.ActiveCfg = PortableApps|Win32\r
+               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.PortableApps|Win32.Build.0 = PortableApps|Win32\r
                {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.Release|Win32.ActiveCfg = zip_gtk2|Win32\r
                {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.Release|Win32.Build.0 = zip_gtk2|Win32\r
-               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.wsdg|Win32.ActiveCfg = nsis|Win32\r
-               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.wsdg|Win32.Build.0 = nsis|Win32\r
+               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.wsdg|Win32.ActiveCfg = PortableApps|Win32\r
+               {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.wsdg|Win32.Build.0 = PortableApps|Win32\r
                {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.zip_gtk1|Win32.ActiveCfg = zip_gtk1|Win32\r
                {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.zip_gtk1|Win32.Build.0 = zip_gtk1|Win32\r
                {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.zip_gtk2|Win32.ActiveCfg = zip_gtk2|Win32\r
                {F23ECB11-E88E-4BAC-986D-E82A0DE3A2B4}.zip_gtk2|Win32.Build.0 = zip_gtk2|Win32\r
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {684AC70D-E5DC-4E42-B70A-DF512A43335C}.PortableApps|Win32.ActiveCfg = Debug|Win32\r
+               {684AC70D-E5DC-4E42-B70A-DF512A43335C}.PortableApps|Win32.Build.0 = Debug|Win32\r
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.Release|Win32.ActiveCfg = Debug|Win32\r
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.Release|Win32.Build.0 = Debug|Win32\r
                {684AC70D-E5DC-4E42-B70A-DF512A43335C}.wsdg|Win32.ActiveCfg = Debug|Win32\r
@@ -81,17 +91,9 @@ 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}.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
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.Release|Win32.ActiveCfg = Release|Win32\r
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.Release|Win32.Build.0 = Release|Win32\r
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -101,6 +103,8 @@ Global
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {CD04EABB-BA03-446F-9A63-A00C08138E91}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.PortableApps|Win32.Build.0 = Release|Win32\r
                {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.Release|Win32.ActiveCfg = Release|Win32\r
                {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.Release|Win32.Build.0 = Release|Win32\r
                {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -110,6 +114,8 @@ Global
                {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {57231C4A-CF70-4CC6-8AED-4C1D6ABC3E94}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {D1417D47-E273-4A90-A49B-6BAF4485CA58}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {D1417D47-E273-4A90-A49B-6BAF4485CA58}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {D1417D47-E273-4A90-A49B-6BAF4485CA58}.PortableApps|Win32.Build.0 = Release|Win32\r
                {D1417D47-E273-4A90-A49B-6BAF4485CA58}.Release|Win32.ActiveCfg = Release|Win32\r
                {D1417D47-E273-4A90-A49B-6BAF4485CA58}.Release|Win32.Build.0 = Release|Win32\r
                {D1417D47-E273-4A90-A49B-6BAF4485CA58}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -119,6 +125,8 @@ Global
                {D1417D47-E273-4A90-A49B-6BAF4485CA58}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {D1417D47-E273-4A90-A49B-6BAF4485CA58}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.PortableApps|Win32.Build.0 = Release|Win32\r
                {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.Release|Win32.ActiveCfg = Release|Win32\r
                {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.Release|Win32.Build.0 = Release|Win32\r
                {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -128,6 +136,8 @@ Global
                {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {96D3AB33-BFA5-4161-B936-8C40D62A44F8}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.PortableApps|Win32.Build.0 = Release|Win32\r
                {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.Release|Win32.ActiveCfg = Release|Win32\r
                {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.Release|Win32.Build.0 = Release|Win32\r
                {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -137,6 +147,8 @@ Global
                {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {527CC23A-32CD-438C-AF42-DF1D9A96EE4D}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.PortableApps|Win32.Build.0 = Release|Win32\r
                {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.Release|Win32.ActiveCfg = Release|Win32\r
                {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.Release|Win32.Build.0 = Release|Win32\r
                {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.wsdg|Win32.ActiveCfg = Release|Win32\r
@@ -146,6 +158,8 @@ Global
                {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.zip_gtk2|Win32.ActiveCfg = Release|Win32\r
                {42C8C754-3ACA-4C5A-A2EA-7488C990A2F5}.zip_gtk2|Win32.Build.0 = Release|Win32\r
                {7D31A4A1-6663-4935-B28D-E179D0D14023}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {7D31A4A1-6663-4935-B28D-E179D0D14023}.PortableApps|Win32.ActiveCfg = Release|Win32\r
+               {7D31A4A1-6663-4935-B28D-E179D0D14023}.PortableApps|Win32.Build.0 = Release|Win32\r
                {7D31A4A1-6663-4935-B28D-E179D0D14023}.Release|Win32.ActiveCfg = Release|Win32\r
                {7D31A4A1-6663-4935-B28D-E179D0D14023}.Release|Win32.Build.0 = Release|Win32\r
                {7D31A4A1-6663-4935-B28D-E179D0D14023}.wsdg|Win32.ActiveCfg = Release|Win32\r