[openrtm-commit:00075] r25 - trunk/ImageProcessing/opencv

[openrtm ＠ openrtm.org]

Author: kurihara
Date: 2011-05-23 02:03:59 +0900 (Mon, 23 May 2011)
New Revision: 25

Modified:
   trunk/ImageProcessing/opencv/user_config.vsprops
Log:
libdir path for sttmbase.lib has been added.

Modified: trunk/ImageProcessing/opencv/user_config.vsprops
===================================================================
--- trunk/ImageProcessing/opencv/user_config.vsprops	2011-05-13 03:23:02 UTC (rev 24)
+++ trunk/ImageProcessing/opencv/user_config.vsprops	2011-05-22 17:03:59 UTC (rev 25)
@@ -6,11 +6,11 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="$(cv_includes)"
+		AdditionalIncludeDirectories="$(cv_includes);$(ds_includes)"
 	/>
 	<Tool
 		Name="VCLinkerTool"
-		AdditionalLibraryDirectories="$(cv_libdir);$(skel_libdir)"
+		AdditionalLibraryDirectories="$(cv_libdir);$(ds_libdir);$(skel_libdir)"
 	/>
 	<UserMacro
 		Name="cv_root"
@@ -41,12 +41,20 @@
 		Value="cv210d.lib highgui210d.lib cxcore210d.lib"
 	/>
 	<UserMacro
+		Name="ds_includes"
+		Value=""$(DXSDK_DIR)\Include\x86\";"$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses""
+	/>
+	<UserMacro
+		Name="ds_libdir"
+		Value=""$(DXSDK_DIR)\Lib\x86\";"$(WindowsSdkDir)\Samples\Multimedia\DirectShow\BaseClasses""
+	/>
+	<UserMacro
 		Name="ds_lib"
-		Value="strmiids.lib winmm.lib strmbase.lib quartz.lib comsuppw.lib"
+		Value="dxerr.lib dxguid.lib d3dx10d.lib d3d9.lib winmm.lib strmiids.lib strmbase.lib"
 	/>
 	<UserMacro
 		Name="ds_libd"
-		Value="strmiids.lib winmm.lib strmbasd.lib quartz.lib comsuppw.lib"
+		Value="dxerr.lib dxguid.lib d3dx9d.lib d3dx10d.lib winmm.lib strmiids.lib strmbased.lib"
 	/>
 	<UserMacro
 		Name="skel_lib"