Removed dlls folder. Copy directly from dependencies instead.

git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/trunk@1910 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d

diff --git a/dlls/FreeImage.dll b/dlls/FreeImage.dll
deleted file mode 100644 (file)
index d6fbf5d..0000000
Binary files a/dlls/FreeImage.dll and /dev/null differ

diff --git a/dlls/avcodec-53.dll b/dlls/avcodec-53.dll
deleted file mode 100644 (file)
index 01366c1..0000000
Binary files a/dlls/avcodec-53.dll and /dev/null differ

diff --git a/dlls/avdevice-53.dll b/dlls/avdevice-53.dll
deleted file mode 100644 (file)
index 9986ce0..0000000
Binary files a/dlls/avdevice-53.dll and /dev/null differ

diff --git a/dlls/avfilter-2.dll b/dlls/avfilter-2.dll
deleted file mode 100644 (file)
index 5e86399..0000000
Binary files a/dlls/avfilter-2.dll and /dev/null differ

diff --git a/dlls/avformat-53.dll b/dlls/avformat-53.dll
deleted file mode 100644 (file)
index 082d4d2..0000000
Binary files a/dlls/avformat-53.dll and /dev/null differ

diff --git a/dlls/avutil-51.dll b/dlls/avutil-51.dll
deleted file mode 100644 (file)
index 647fa1a..0000000
Binary files a/dlls/avutil-51.dll and /dev/null differ

diff --git a/dlls/glew32.dll b/dlls/glew32.dll
deleted file mode 100644 (file)
index 7f55467..0000000
Binary files a/dlls/glew32.dll and /dev/null differ

diff --git a/dlls/libsndfile-1.dll b/dlls/libsndfile-1.dll
deleted file mode 100644 (file)
index f112de2..0000000
Binary files a/dlls/libsndfile-1.dll and /dev/null differ

diff --git a/dlls/openal32.dll b/dlls/openal32.dll
deleted file mode 100644 (file)
index 28eb8e5..0000000
Binary files a/dlls/openal32.dll and /dev/null differ

diff --git a/dlls/postproc-51.dll b/dlls/postproc-51.dll
deleted file mode 100644 (file)
index 3c519f6..0000000
Binary files a/dlls/postproc-51.dll and /dev/null differ

diff --git a/dlls/sfml-audio-d.dll b/dlls/sfml-audio-d.dll
deleted file mode 100644 (file)
index 3d6b4f7..0000000
Binary files a/dlls/sfml-audio-d.dll and /dev/null differ

diff --git a/dlls/sfml-audio.dll b/dlls/sfml-audio.dll
deleted file mode 100644 (file)
index f4ab81b..0000000
Binary files a/dlls/sfml-audio.dll and /dev/null differ

diff --git a/dlls/sfml-graphics-d.dll b/dlls/sfml-graphics-d.dll
deleted file mode 100644 (file)
index 1f93bc6..0000000
Binary files a/dlls/sfml-graphics-d.dll and /dev/null differ

diff --git a/dlls/sfml-graphics.dll b/dlls/sfml-graphics.dll
deleted file mode 100644 (file)
index c73dba6..0000000
Binary files a/dlls/sfml-graphics.dll and /dev/null differ

diff --git a/dlls/sfml-system-d.dll b/dlls/sfml-system-d.dll
deleted file mode 100644 (file)
index c439c59..0000000
Binary files a/dlls/sfml-system-d.dll and /dev/null differ

diff --git a/dlls/sfml-system.dll b/dlls/sfml-system.dll
deleted file mode 100644 (file)
index 56fbf8e..0000000
Binary files a/dlls/sfml-system.dll and /dev/null differ

diff --git a/dlls/sfml-window-d.dll b/dlls/sfml-window-d.dll
deleted file mode 100644 (file)
index 395b9f6..0000000
Binary files a/dlls/sfml-window-d.dll and /dev/null differ

diff --git a/dlls/sfml-window.dll b/dlls/sfml-window.dll
deleted file mode 100644 (file)
index 28ea7cf..0000000
Binary files a/dlls/sfml-window.dll and /dev/null differ

diff --git a/dlls/swresample-0.dll b/dlls/swresample-0.dll
deleted file mode 100644 (file)
index 1f3215c..0000000
Binary files a/dlls/swresample-0.dll and /dev/null differ

diff --git a/dlls/swscale-2.dll b/dlls/swscale-2.dll
deleted file mode 100644 (file)
index 92fe03e..0000000
Binary files a/dlls/swscale-2.dll and /dev/null differ

diff --git a/dlls/tbb.dll b/dlls/tbb.dll
deleted file mode 100644 (file)
index 5f4f57a..0000000
Binary files a/dlls/tbb.dll and /dev/null differ

diff --git a/dlls/tbb_debug.dll b/dlls/tbb_debug.dll
deleted file mode 100644 (file)
index f71394d..0000000
Binary files a/dlls/tbb_debug.dll and /dev/null differ

diff --git a/dlls/tbbmalloc.dll b/dlls/tbbmalloc.dll
deleted file mode 100644 (file)
index 60e7c40..0000000
Binary files a/dlls/tbbmalloc.dll and /dev/null differ

diff --git a/dlls/tbbmalloc_debug.dll b/dlls/tbbmalloc_debug.dll
deleted file mode 100644 (file)
index bc94d62..0000000
Binary files a/dlls/tbbmalloc_debug.dll and /dev/null differ

diff --git a/dlls/tbbmalloc_proxy.dll b/dlls/tbbmalloc_proxy.dll
deleted file mode 100644 (file)
index eae894f..0000000
Binary files a/dlls/tbbmalloc_proxy.dll and /dev/null differ

diff --git a/dlls/tbbmalloc_proxy_debug.dll b/dlls/tbbmalloc_proxy_debug.dll
deleted file mode 100644 (file)
index 439bdfe..0000000
Binary files a/dlls/tbbmalloc_proxy_debug.dll and /dev/null differ

diff --git a/dlls/zlib1.dll b/dlls/zlib1.dll
deleted file mode 100644 (file)
index 869b00d..0000000
Binary files a/dlls/zlib1.dll and /dev/null differ

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index b82f58595674abf064cb19ff56193304f7aa3052..33ff4ab60cd3a83da6397651cc1a330dbe619ed3 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -198,7 +198,13 @@
       <MapExports>false</MapExports>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
@@ -254,7 +260,13 @@ copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
       <LargeAddressAware>true</LargeAddressAware>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
@@ -309,7 +321,13 @@ copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r
@@ -364,7 +382,13 @@ copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>\r
     </Link>\r
     <PostBuildEvent>\r
-      <Command>copy "$(SolutionDir)dlls\*.dll" "$(OutDir)"\r
+      <Command>copy "$(SolutionDir)dependencies\ffmpeg 0.8\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\FreeImage\Dist\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\glew-1.6.0\bin\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\tbb\bin\ia32\vc10\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\zlib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\lib\*.dll" "$(OutDir)"\r
+copy "$(SolutionDir)dependencies\SFML-1.6\extlibs\bin\*.dll" "$(OutDir)"\r
 copy "$(ProjectDir)casparcg.config" "$(OutDir)"</Command>\r
     </PostBuildEvent>\r
   </ItemDefinitionGroup>\r