2.0.0.2: Removed static linkage to dxguid.lib.

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

diff --git a/core/producer/flash/FlashAxContainer.h b/core/producer/flash/FlashAxContainer.h
index aef82aa29bb4f09fab56b284274fa931a6716b59..e8abd5741e13988fbcd36a2581b03c8d6f4983ac 100644 (file)
--- a/core/producer/flash/FlashAxContainer.h
+++ b/core/producer/flash/FlashAxContainer.h
@@ -35,11 +35,13 @@
 #include "axflash.h"\r
 //#import "progid:ShockwaveFlash.ShockwaveFlash.9" no_namespace, named_guids\r
 \r
-#include <ddraw.h>\r
 #include <comdef.h>\r
 \r
 #include "TimerHelper.h"\r
 \r
+#include <InitGuid.h>\r
+#include <ddraw.h>\r
+\r
 #ifndef DEFINE_GUID2\r
 #define DEFINE_GUID2(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\r
                const GUID name \\r

diff --git a/shell/caspar.config b/shell/caspar.config
index 94a7f76543c12aaf1a7f8906e0c7e71a468a0151..1c40e2ce260ab8dc2edd1678da1859206331799c 100644 (file)
--- a/shell/caspar.config
+++ b/shell/caspar.config
@@ -4,6 +4,7 @@
     <media-path>C:\\Casparcg\\_media\\</media-path>\r
     <log-path>C:\\Casparcg\\_log\\</log-path>\r
     <template-path>C:\\Casparcg\\</template-path>\r
+    <template-host-path>C:\\Casparcg\\cg.fth.18</template-host-path>\r
     <data-path>C:\\Casparcg\\_data\\</data-path>\r
   </paths>\r
   <channels>\r

diff --git a/shell/shell.vcxproj b/shell/shell.vcxproj
index 8d7e433146dc483ff9da9c9eba667c31579a8861..b4e01cbee499460af88cfd7202242c7711f5d74a 100644 (file)
--- a/shell/shell.vcxproj
+++ b/shell/shell.vcxproj
@@ -113,7 +113,7 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>\r
     </ClCompile>\r
     <Link>\r
-      <AdditionalDependencies>dxguid.lib;sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-audio-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;OpenGL32.lib;FreeImage.lib;GLee.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;swscale-0.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
@@ -162,7 +162,7 @@
       </Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <AdditionalDependencies>dxguid.lib;sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
+      <AdditionalDependencies>sfml-audio.lib;sfml-window.lib;sfml-graphics.lib;OpenGL32.lib;FreeImage.lib;Winmm.lib;Ws2_32.lib;avformat-52.lib;avcodec-52.lib;avutil-50.lib;SWSCALE-0.lib;tbb.lib;Glee.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <Version>\r
       </Version>\r
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r