X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fffmpeg%2Fffmpeg.vcxproj;h=eaeb44590d518a6894d41765e98eb450e2d9e781;hb=70a9a3b618fb6ee15089aecd333f9a579f2a5927;hp=7b1c341900adc9ce1dd590cbe8d4b2ec343c9819;hpb=ac63db0999822c5407f3c5c6c829b4bea6069ff8;p=casparcg
diff --git a/modules/ffmpeg/ffmpeg.vcxproj b/modules/ffmpeg/ffmpeg.vcxproj
index 7b1c34190..eaeb44590 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.7\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.7\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.7\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\;..\..\dependencies\boost_1_44_0\;..\..\dependencies\ffmpeg 0.7\include\;..\..\dependencies\tbb30_20100406oss\include\;$(IncludePath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.7\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.7\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.7\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
- ..\..\dependencies\boost_1_44_0\stage\lib\;..\..\dependencies\ffmpeg 0.7\lib\;..\..\dependencies\tbb30_20100406oss\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\;..\..\dependencies\boost\;..\..\dependencies\ffmpeg\include\;..\..\dependencies\tbb\include\;$(IncludePath)
+ ..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
+ ..\..\dependencies\boost\stage\lib\;..\..\dependencies\ffmpeg\lib\;..\..\dependencies\tbb\lib\ia32\vc10\;$(LibraryPath)
$(ProjectDir)bin\$(Configuration)\
$(ProjectDir)bin\$(Configuration)\
$(ProjectDir)bin\$(Configuration)\
@@ -107,8 +107,8 @@
Use
true
Level4
- EditAndContinue
- TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;%(PreprocessorDefinitions)
+ ProgramDatabase
+ TBB_USE_DEBUG;TBB_USE_CAPTURED_EXCEPTION=0;TBB_USE_ASSERT=1;_DEBUG;%(PreprocessorDefinitions)
true
true
Fast
@@ -273,25 +273,69 @@
../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
+
../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
@@ -304,17 +348,32 @@
Create
Create
+
+ ../StdAfx.h
+ ../StdAfx.h
+ ../StdAfx.h
+ ../StdAfx.h
+
+
+
+
-
-
+
+
+
+
+
+
+
+