git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@556...

diff --git a/casparcg.sln b/casparcg.sln
index ec96e3f214990793af718b21920976aa7b15a0c3..8716ca6a8a2ea06314962b7818e67e3d5078c3f6 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server", "server\Server.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"\r
 EndProject\r
+Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "server setup\Server Setup.vdproj", "{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}"\r
+EndProject\r
 Global\r
        GlobalSection(SubversionScc) = preSolution\r
                Svn-Managed = True\r
@@ -10,16 +12,37 @@ Global
        EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
+<<<<<<< .mine\r
+               FFMPEG 0.5|Win32 = FFMPEG 0.5|Win32\r
+               no bluefish|Win32 = no bluefish|Win32\r
+=======\r
                no_bluefish|Win32 = no_bluefish|Win32\r
+>>>>>>> .r555\r
                Release|Win32 = Release|Win32\r
+               WO Bluefish|Win32 = WO Bluefish|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.Build.0 = Debug|Win32\r
+<<<<<<< .mine\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.ActiveCfg = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.Build.0 = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.ActiveCfg = no_bluefish|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.Build.0 = no_bluefish|Win32\r
+=======\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no_bluefish|Win32.ActiveCfg = no_bluefish|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no_bluefish|Win32.Build.0 = no_bluefish|Win32\r
+>>>>>>> .r555\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.ActiveCfg = Release|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.Build.0 = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.ActiveCfg = Release|Win32\r
+               {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.Build.0 = Release|Win32\r
+               {514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.Debug|Win32.ActiveCfg = Debug\r
+               {514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.Debug|Win32.Build.0 = Debug\r
+               {514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.FFMPEG 0.5|Win32.ActiveCfg = FFMPEG 0.5\r
+               {514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.no bluefish|Win32.ActiveCfg = Release\r
+               {514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.Release|Win32.ActiveCfg = Release\r
+               {514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.WO Bluefish|Win32.ActiveCfg = WO Bluefish\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/no bluefish/CasparCG.exe b/no bluefish/CasparCG.exe
index e48ebdbd934c50ec70976c309e249c7f202cd869..a1dec8bb5a1ae44dd0b50bd120574fab916554d9 100644 (file)
Binary files a/no bluefish/CasparCG.exe and b/no bluefish/CasparCG.exe differ

diff --git a/server/Server.vcxproj b/server/Server.vcxproj
index 76c9824f3fe3e2e2be9b75ed4720898e18e5bcc4..cfd2471edbc788c21ea4e6d15b9d97d7ca375d67 100644 (file)
--- a/server/Server.vcxproj
+++ b/server/Server.vcxproj
@@ -78,9 +78,9 @@
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.5\include\;..\..\..\dependencies\ffmpeg 0.5\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\WTL80\include;..\..\dependencies\WTL80\include;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Inc\;..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.5\include\;..\..\..\dependencies\ffmpeg 0.5\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\WTL80\include;..\..\dependencies\WTL80\include;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>\r
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='no_bluefish|Win32'">..\..\dependencies\boost_1_44_0\;..\..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.5\include\;..\..\..\dependencies\ffmpeg 0.5\include\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\include\;..\..\..\dependencies\SFML-1.6\include\;..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\tbb30_20100406oss\include\;..\..\..\dependencies\WTL80\include;..\..\dependencies\WTL80\include;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Include;$(IncludePath)</IncludePath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.5\lib\;..\..\..\dependencies\ffmpeg 0.5\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;C:\Program\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.5\lib\;..\..\..\dependencies\ffmpeg 0.5\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;C:\Program\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>\r
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='no_bluefish|Win32'">..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.5\lib\;..\..\..\dependencies\ffmpeg 0.5\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;C:\Program\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.5\lib\;..\..\..\dependencies\ffmpeg 0.5\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\..\dependencies\BluefishSDK_V5_8_0_31\Lib\;..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.5\lib\;..\..\..\dependencies\ffmpeg 0.5\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>\r
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='no_bluefish|Win32'">..\..\dependencies\boost_1_44_0\stage\lib\;..\..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.5\lib\;..\..\..\dependencies\ffmpeg 0.5\lib\;..\..\dependencies\FreeImage\Dist\;..\..\..\dependencies\FreeImage\Dist\;..\..\dependencies\GLee5_4\;..\..\..\dependencies\GLee5_4\;..\..\dependencies\SFML-1.6\lib\;..\..\..\dependencies\SFML-1.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;..\..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;C:\Program Files\Microsoft DirectX SDK %28June 2010%29\Lib\x86;$(LibraryPath)</LibraryPath>\r
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <PreBuildEvent>\r

diff --git a/server/build/CasparCG_Bluefish.exe b/server/build/CasparCG_Bluefish.exe
index 43bf6bfea2faf894559889221dc59fd38cd6c4ed..a4449d4908215ad99f5f0643511a466e9fa5972d 100644 (file)
Binary files a/server/build/CasparCG_Bluefish.exe and b/server/build/CasparCG_Bluefish.exe differ