Refactored to use non-static data member initializers where it makes sense. Mixes...

[casparcg] / casparcg.sln

diff --git a/casparcg.sln b/casparcg.sln
index f3604fc964c3856f61b81ce3cbe7c582b0705059..5b20f56af239b2e93e02f900e045d4ea58b945d7 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -1,6 +1,8 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual Studio 2010\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 2013\r
+VisualStudioVersion = 12.0.31101.0\r
+MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell", "shell\shell.vcxproj", "{8C26C94F-8092-4769-8D84-DEA479721C5B}"\r
@@ -10,7 +12,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documents", "documents", "{32079541-68ED-4319-91FB-0FF041642679}"\r
        ProjectSection(SolutionItems) = preProject\r
                CHANGES.txt = CHANGES.txt\r
-               COPYING.txt = COPYING.txt\r
+               LICENSE.txt = LICENSE.txt\r
                README.txt = README.txt\r
        EndProjectSection\r
 EndProject\r
@@ -36,11 +38,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "accelerator", "accelerator\
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screen", "modules\screen\screen.vcxproj", "{88F974F0-D09F-4788-8CF8-F563209E60C1}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd", "modules\psd\psd.vcxproj", "{866A164B-6F7A-450E-8452-C6AE4E176436}"\r
+EndProject\r
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BCB4FCF8-987F-40D8-87B5-8F7CE1D5D212}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "psd-test", "test\psd-test\psd-test.vcxproj", "{156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit-test", "unit-test\unit-test.vcxproj", "{3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}"\r
+EndProject\r
 Global\r
-       GlobalSection(SubversionScc) = preSolution\r
-               Svn-Managed = True\r
-               Manager = AnkhSVN - Subversion Support for Visual Studio\r
-       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Mixed Platforms = Debug|Mixed Platforms\r
                Debug|Win32 = Debug|Win32\r
@@ -180,6 +186,32 @@ Global
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|Win32.ActiveCfg = Release|x64\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|x64.ActiveCfg = Release|x64\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|x64.Build.0 = Release|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Debug|Mixed Platforms.ActiveCfg = Debug|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Debug|Mixed Platforms.Build.0 = Debug|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Debug|Win32.ActiveCfg = Debug|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Debug|x64.ActiveCfg = Debug|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Debug|x64.Build.0 = Debug|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|Mixed Platforms.ActiveCfg = Release|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|Mixed Platforms.Build.0 = Release|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|Win32.ActiveCfg = Release|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|x64.ActiveCfg = Release|x64\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436}.Release|x64.Build.0 = Release|x64\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|Mixed Platforms.ActiveCfg = Debug|x64\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|Win32.ActiveCfg = Debug|x64\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Debug|x64.ActiveCfg = Debug|x64\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|Mixed Platforms.ActiveCfg = Release|x64\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|Win32.ActiveCfg = Release|x64\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC}.Release|x64.ActiveCfg = Release|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Debug|Mixed Platforms.ActiveCfg = Debug|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Debug|Mixed Platforms.Build.0 = Debug|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Debug|Win32.ActiveCfg = Debug|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Debug|x64.ActiveCfg = Debug|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Debug|x64.Build.0 = Debug|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Release|Mixed Platforms.ActiveCfg = Release|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Release|Mixed Platforms.Build.0 = Release|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Release|Win32.ActiveCfg = Release|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Release|x64.ActiveCfg = Release|x64\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -193,5 +225,8 @@ Global
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {7D58BD57-FDD5-46E6-A23B-ED14B5314A0E} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
+               {866A164B-6F7A-450E-8452-C6AE4E176436} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
+               {156C91E0-8CAC-4DBA-A212-AAFDAFACD8BC} = {BCB4FCF8-987F-40D8-87B5-8F7CE1D5D212}\r
+               {3D4DA315-EEFD-4AAD-91B8-CBA879D7F440} = {BCB4FCF8-987F-40D8-87B5-8F7CE1D5D212}\r
        EndGlobalSection\r
 EndGlobal\r