Manually merged pull request #222

[casparcg] / casparcg.sln

diff --git a/casparcg.sln b/casparcg.sln
index 695425a11dae80c07101e129f7a9f737b9d52c5d..879216d5b3fa8bee0575ce8d179cdcf60699c5f4 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -32,10 +32,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "modules\image\imag
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{02308602-7FE0-4253-B96E-22134919F56A}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "portaudio", "modules\portaudio\portaudio.vcxproj", "{36A2D15A-41D3-485C-BC70-187B7FC6E6C4}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newtek", "modules\newtek\newtek.vcxproj", "{29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "modules\html\html.vcxproj", "{701A5E6E-DB53-4503-834D-263C6A18189A}"\r
+EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -132,14 +132,6 @@ Global
                {02308602-7FE0-4253-B96E-22134919F56A}.Profile|Win32.Build.0 = Profile|Win32\r
                {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.ActiveCfg = Release|Win32\r
                {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.Build.0 = Release|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Debug|Win32.Build.0 = Debug|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Develop|Win32.ActiveCfg = Develop|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Develop|Win32.Build.0 = Develop|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Profile|Win32.ActiveCfg = Profile|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Profile|Win32.Build.0 = Profile|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Release|Win32.ActiveCfg = Release|Win32\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4}.Release|Win32.Build.0 = Release|Win32\r
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Debug|Win32.Build.0 = Debug|Win32\r
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Develop|Win32.ActiveCfg = Develop|Win32\r
@@ -148,6 +140,14 @@ Global
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Profile|Win32.Build.0 = Profile|Win32\r
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Release|Win32.ActiveCfg = Release|Win32\r
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Release|Win32.Build.0 = Release|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Develop|Win32.ActiveCfg = Develop|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Develop|Win32.Build.0 = Develop|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Profile|Win32.Build.0 = Profile|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -160,7 +160,7 @@ Global
                {82ED7ED6-8A15-40EC-A8AF-F5E712E0DA68} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
-               {36A2D15A-41D3-485C-BC70-187B7FC6E6C4} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
        EndGlobalSection\r
 EndGlobal\r