[artoolkit-commits] artoolkit/util/calib_camera2 calib_camera2.vcproj,1.1,1.2 main.c,1.3,1.4

[Philip L. <phi...@us...>]

Update of /cvsroot/artoolkit/artoolkit/util/calib_camera2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22271

Modified Files:
	calib_camera2.vcproj main.c 
Log Message:
Merge DSVideoLib-0.0.8b.

Index: calib_camera2.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/calib_camera2.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** calib_camera2.vcproj	22 Nov 2004 02:49:02 -0000	1.1
--- calib_camera2.vcproj	23 Jul 2005 00:02:32 -0000	1.2
***************
*** 18,22 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)/../../include"
  				PreprocessorDefinitions="WIN32;_DEBUG"
  				BasicRuntimeChecks="3"
--- 18,22 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)../../include"
  				PreprocessorDefinitions="WIN32;_DEBUG"
  				BasicRuntimeChecks="3"
***************
*** 31,36 ****
  				AdditionalOptions="/DEBUG"
  				AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""
  				GenerateDebugInformation="TRUE"/>
  			<Tool
--- 31,36 ----
  				AdditionalOptions="/DEBUG"
  				AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"
  				GenerateDebugInformation="TRUE"/>
  			<Tool
***************
*** 70,74 ****
  				InlineFunctionExpansion="1"
  				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)/../../include"
  				PreprocessorDefinitions="WIN32;NDEBUG"
  				RuntimeLibrary="0"/>
--- 70,74 ----
  				InlineFunctionExpansion="1"
  				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)../../include"
  				PreprocessorDefinitions="WIN32;NDEBUG"
  				RuntimeLibrary="0"/>
***************
*** 78,83 ****
  				Name="VCLinkerTool"
  				AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)/../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"
--- 78,83 ----
  				Name="VCLinkerTool"
  				AdditionalDependencies="libAR.lib libARvideo.lib libARgsub.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"

Index: main.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/calib_camera2/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** main.c	20 Jul 2005 22:38:59 -0000	1.3
--- main.c	23 Jul 2005 00:02:32 -0000	1.4
***************
*** 53,57 ****
  #  endif
  #elif defined(_WIN32)
! char			*vconf = "flipV,showDlg";
  #elif defined(__APPLE__)
  char			*vconf = "-width=640 -height=480";
--- 53,57 ----
  #  endif
  #elif defined(_WIN32)
! char			*vconf = "WDM_camera_flipV.xml";
  #elif defined(__APPLE__)
  char			*vconf = "-width=640 -height=480";