From: Zebiolo Date: Thu, 30 Sep 2010 07:17:20 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.1~984 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0cfdc574c001f2c173f09b44de0bdac47c81b8ab;p=casparcg git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.0@145 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/casparcg.sln b/casparcg.sln index 8c9c0a08d..78852af79 100644 --- a/casparcg.sln +++ b/casparcg.sln @@ -12,37 +12,17 @@ Global EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - FFMPEG 0.5|Win32 = FFMPEG 0.5|Win32 - no bluefish|Win32 = no bluefish|Win32 Release|Win32 = Release|Win32 - ReleaseProfiling|Win32 = ReleaseProfiling|Win32 - WO Bluefish|Win32 = WO Bluefish|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.ActiveCfg = Debug|Win32 {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.Build.0 = Debug|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.ActiveCfg = Release|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.Build.0 = Release|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.ActiveCfg = no bluefish|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.Build.0 = no bluefish|Win32 {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.ActiveCfg = Release|Win32 {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.Build.0 = Release|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.ReleaseProfiling|Win32.ActiveCfg = ReleaseProfiling|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.ReleaseProfiling|Win32.Build.0 = ReleaseProfiling|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.ActiveCfg = Release|Win32 - {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.Build.0 = Release|Win32 {02308602-7FE0-4253-B96E-22134919F56A}.Debug|Win32.ActiveCfg = Debug|Win32 {02308602-7FE0-4253-B96E-22134919F56A}.Debug|Win32.Build.0 = Debug|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.FFMPEG 0.5|Win32.ActiveCfg = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.FFMPEG 0.5|Win32.Build.0 = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.no bluefish|Win32.ActiveCfg = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.no bluefish|Win32.Build.0 = Release|Win32 {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.ActiveCfg = Release|Win32 {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.Build.0 = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.ReleaseProfiling|Win32.ActiveCfg = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.ReleaseProfiling|Win32.Build.0 = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.WO Bluefish|Win32.ActiveCfg = Release|Win32 - {02308602-7FE0-4253-B96E-22134919F56A}.WO Bluefish|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/common/common.vcxproj b/common/common.vcxproj index 18c8d46c6..e5ce30c83 100644 --- a/common/common.vcxproj +++ b/common/common.vcxproj @@ -37,7 +37,18 @@ - + + ..\..\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.6\include\;..\..\..\dependencies\ffmpeg 0.6\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\;$(IncludePath) + ..\..\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.6\lib\;..\..\..\dependencies\ffmpeg 0.6\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\;..\..\..\dependencies\tbb30_20100406oss\lib\;$(LibraryPath) + $(ProjectDir)debug\ + debug\ + + + ..\..\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.6\include\;..\..\..\dependencies\ffmpeg 0.6\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\;$(IncludePath) + ..\..\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.6\lib\;..\..\..\dependencies\ffmpeg 0.6\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\;..\..\..\dependencies\tbb30_20100406oss\lib\;$(LibraryPath) + $(ProjectDir)release\ + release\ + Use diff --git a/server/Server.vcxproj b/server/Server.vcxproj index 3a2428ce5..e1207815f 100644 --- a/server/Server.vcxproj +++ b/server/Server.vcxproj @@ -5,14 +5,6 @@ Debug Win32 - - no bluefish - Win32 - - - ReleaseProfiling - Win32 - Release Win32 @@ -25,19 +17,11 @@ server - - Application - Unicode - Application Unicode true - - Application - Unicode - Application Unicode @@ -47,18 +31,10 @@ - - - - - - - - @@ -66,19 +42,14 @@ <_ProjectFileVersion>10.0.30319.1 - $(ProjectDir)build\ debug\ - true - $(ProjectDir)build\ - $(ProjectDir)build\ release\ - release\ - false - false - $(SolutionDir)$(Configuration)\ - $(Configuration)\ - false - C:\Lokala Filer\SDK\ffmpeg\src\ffmpeg-export-2008-11-05\libavcodec\i386;$(SourcePath) + ..\..\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.6\include\;..\..\..\dependencies\ffmpeg 0.6\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\;$(IncludePath) + ..\..\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.6\include\;..\..\..\dependencies\ffmpeg 0.6\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\;$(IncludePath) + ..\..\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.6\lib\;..\..\..\dependencies\ffmpeg 0.6\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\;$(LibraryPath) + ..\..\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.6\lib\;..\..\..\dependencies\ffmpeg 0.6\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\;$(LibraryPath) + $(ProjectDir)debug\ + $(ProjectDir)release\ @@ -103,7 +74,7 @@ true - sfml-audio-d.lib;sfml-window-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Dxguid.lib;Dsound.lib;Winmm.lib;Ws2_32.lib;BlueVelvet3_d.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies) + sfml-audio-d.lib;sfml-window-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;BlueVelvet3_d.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -120,8 +91,8 @@ MachineX86 - - + copy "$(TargetPath)" "$(SolutionDir)build\" +copy "$(ProjectDir)caspar.config" "$(SolutionDir)build\" @@ -150,7 +121,7 @@ - sfml-audio.lib;sfml-window.lib;OpenGL32.lib;FreeImage.lib;Dxguid.lib;Dsound.lib;Winmm.lib;Ws2_32.lib;Bluevelvet3.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies) + sfml-audio.lib;sfml-window.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;Bluevelvet3.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies) %(AdditionalLibraryDirectories) @@ -170,107 +141,8 @@ MachineX86 - - - - - - - - - - - MaxSpeed - AnySuitable - true - Speed - %(AdditionalIncludeDirectories) - Async - MultiThreadedDLL - StreamingSIMDExtensions2 - true - Use - Level3 - ProgramDatabase - true - TBB_USE_THREADING_TOOLS=1;NDEBUG;_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions) - - - - - - - OpenGL32.lib;FreeImage.lib;Dxguid.lib;Dsound.lib;Winmm.lib;Ws2_32.lib;Bluevelvet3.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies) - - - %(AdditionalLibraryDirectories) - LIBC.lib;%(IgnoreSpecificDefaultLibraries) - true - true - true - Console - - - - - false - false - - - MachineX86 - - - - - - - - - - - - - Disabled - AnySuitable - true - Speed - %(AdditionalIncludeDirectories) - DISABLE_BLUEFISH;%(PreprocessorDefinitions) - Async - MultiThreadedDebugDLL - StreamingSIMDExtensions2 - true - Use - Level3 - ProgramDatabase - - - - - - - OpenGL32.lib;FreeImage.lib;Dxguid.lib;Dsound.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;GLee.lib;tbb.lib;%(AdditionalDependencies) - - - %(AdditionalLibraryDirectories) - LIBC.lib;%(IgnoreSpecificDefaultLibraries) - true - true - true - Console - - - - - false - false - - - MachineX86 - - - - + copy "$(TargetPath)" "$(SolutionDir)build\" +copy "$(ProjectDir)caspar.config" "$(SolutionDir)build\" @@ -333,219 +205,147 @@ ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h NotUsing NotUsing - NotUsing - NotUsing ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../StdAfx.h - ../StdAfx.h - ../StdAfx.h ../StdAfx.h ..\stdafx.h - ..\stdafx.h ..\stdafx.h - ..\stdafx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../../StdAfx.h - ../../../StdAfx.h - ../../../StdAfx.h ../../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../../StdAfx.h - ../../../StdAfx.h - ../../../StdAfx.h ../../../StdAfx.h ../../../StdAfx.h - ../../../StdAfx.h - ../../../StdAfx.h ../../../StdAfx.h ../../../StdAfx.h - ../../../StdAfx.h - ../../../StdAfx.h ../../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h NotUsing - NotUsing - NotUsing NotUsing ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ../../StdAfx.h - ../../StdAfx.h - ../../StdAfx.h ../../StdAfx.h ..\..\stdafx.h - ..\..\stdafx.h - ..\..\stdafx.h ..\..\stdafx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ../StdAfx.h - ../StdAfx.h - ../StdAfx.h ../StdAfx.h ..\..\StdAfx.h - ..\..\StdAfx.h - ..\..\StdAfx.h ..\..\StdAfx.h ../StdAfx.h - ../StdAfx.h ../StdAfx.h - ../StdAfx.h ../StdAfx.h - ../StdAfx.h ../StdAfx.h - ../StdAfx.h false @@ -554,46 +354,32 @@ ..\StdAfx.h ..\StdAfx.h - ..\StdAfx.h - ..\StdAfx.h ..\StdAfx.h ..\StdAfx.h - ..\StdAfx.h - ..\StdAfx.h Create Create - Create - Create true - true - true true true - true - true true true - true - true true true - true - true true diff --git a/server/caspar.config b/server/caspar.config index 8a97e18b4..8c4120d4b 100644 --- a/server/caspar.config +++ b/server/caspar.config @@ -1,10 +1,10 @@ - C:\\casparcg\\Repository\\media\\ - C:\\casparcg\\Repository\\log\\ - C:\\casparcg\\Repository\\templates\\ - C:\\casparcg\\Repository\\data\\ + media\\ + log\\ + templates\\ + data\\