X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fffmpeg.vcxproj;h=ad2bdc7165e3e20d67c8e9bc058d5d3435fc0ed1;hb=6016fd682b267d2886babd51b1faa9cdd1812d54;hp=8730803ab6295a751d48962d75267179937bd10e;hpb=ceb9adee0ab86fbc991c3f4a8f0ce1b0fa0a6c16;p=casparcg
diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index 8730803ab..ad2bdc716 100644
--- a/modules/ffmpeg/ffmpeg.vcxproj
+++ b/modules/ffmpeg/ffmpeg.vcxproj
@@ -72,14 +72,14 @@
$(ProjectDir)tmp\$(Configuration)\
$(ProjectDir)tmp\$(Configuration)\
$(ProjectDir)tmp\$(Configuration)\
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.6\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.6\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.8\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.8\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
$(ProjectDir)bin\$(Configuration)\
$(ProjectDir)bin\$(Configuration)\
$(ProjectDir)bin\$(Configuration)\
@@ -108,7 +108,7 @@
true
Level4
EditAndContinue
- TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;%(PreprocessorDefinitions)
+ TBB_USE_DEBUG;TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;%(PreprocessorDefinitions)
true
true
Fast
@@ -272,19 +272,60 @@
../StdAfx.h
../StdAfx.h
../StdAfx.h
+ true
+ true
+ true
+ true
+
+
+ false
-
../../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
+
+
+ ../../StdAfx.h
+ ../../StdAfx.h
+ ../../StdAfx.h
+ ../../StdAfx.h
+
+
+ ../../StdAfx.h
+ ../../StdAfx.h
+ ../../StdAfx.h
+ ../../StdAfx.h
+
+
+ Use
+ ../../StdAfx.h
+ Use
+ ../../StdAfx.h
+ Use
+ ../../StdAfx.h
+ Use
+ ../../StdAfx.h
+
+
+ ../StdAfx.h
+ ../StdAfx.h
+ ../StdAfx.h
+ ../StdAfx.h
../StdAfx.h
@@ -292,6 +333,12 @@
../StdAfx.h
../StdAfx.h
+
+ ../../StdAfx.h
+ ../../StdAfx.h
+ ../../StdAfx.h
+ ../../StdAfx.h
+
../../StdAfx.h
../../StdAfx.h
@@ -304,15 +351,24 @@
Create
Create
+
+
+
+
+
+
+
+
+