[artoolkit-commits] artoolkit/util/videoTest videoTest.vcproj,1.1,1.2 videoTest.c,1.4,1.5

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

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

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

Index: videoTest.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/videoTest/videoTest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** videoTest.c	20 Jul 2005 22:25:39 -0000	1.4
--- videoTest.c	23 Jul 2005 00:00:59 -0000	1.5
***************
*** 16,28 ****
  #include <AR/ar.h>
  
- /*****************************************************************************/
- // modified by Thomas Pintaric, Vienna University of Technology
- 
  #ifdef _WIN32
! char			*vconf = "flipV"; // see video.h for a list of supported parameters
  #else
  char			*vconf = "";
  #endif
- /*****************************************************************************/
  
  int             xsize, ysize;
--- 16,24 ----
  #include <AR/ar.h>
  
  #ifdef _WIN32
! char			*vconf = "WDM_camera_flipV.xml";
  #else
  char			*vconf = "";
  #endif
  
  int             xsize, ysize;

Index: videoTest.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/videoTest/videoTest.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** videoTest.vcproj	22 Nov 2004 02:42:41 -0000	1.1
--- videoTest.vcproj	23 Jul 2005 00:00:59 -0000	1.2
***************
*** 4,8 ****
  	Version="7.10"
  	Name="videoTest"
! 	ProjectGUID="{401D60F6-AF80-481B-A6EB-9FB03130AB1F}">
  	<Platforms>
  		<Platform
--- 4,9 ----
  	Version="7.10"
  	Name="videoTest"
! 	ProjectGUID="{401D60F6-AF80-481B-A6EB-9FB03130AB1F}"
! 	RootNamespace="videoTest">
  	<Platforms>
  		<Platform
***************
*** 18,26 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)/../../include"
  				PreprocessorDefinitions="WIN32;_DEBUG"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
  				BrowseInformation="1"
  				WarningLevel="3"
  				DebugInformationFormat="4"/>
--- 19,30 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)..\..\include"
  				PreprocessorDefinitions="WIN32;_DEBUG"
  				BasicRuntimeChecks="3"
  				RuntimeLibrary="1"
+ 				ObjectFile="$(IntDir)\"
+ 				ProgramDataBaseFileName="$(IntDir)\vc70.pdb"
  				BrowseInformation="1"
+ 				BrowseInformationFile="$(IntDir)"
  				WarningLevel="3"
  				DebugInformationFormat="4"/>
***************
*** 30,37 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)/../../lib&quot;"
! 				GenerateDebugInformation="TRUE"/>
  			<Tool
  				Name="VCMIDLTool"
--- 34,42 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsubd.lib libARvideod.lib opengl32.lib glu32.lib glut32.lib"
! 				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"
! 				GenerateDebugInformation="TRUE"
! 				ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"/>
  			<Tool
  				Name="VCMIDLTool"
***************
*** 70,74 ****
  				InlineFunctionExpansion="1"
  				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)/../../include"
  				PreprocessorDefinitions="WIN32;NDEBUG"
  				RuntimeLibrary="0"/>
--- 75,79 ----
  				InlineFunctionExpansion="1"
  				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)..\..\include"
  				PreprocessorDefinitions="WIN32;NDEBUG"
  				RuntimeLibrary="0"/>
***************
*** 77,83 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)/../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"
--- 82,88 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib opengl32.lib glu32.lib glut32.lib"
! 				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"