[artoolkit-commits] artoolkit/examples/paddleInteraction paddleInteractionTest.vcproj,1.1,1.2 paddleInteractionTest.c,1.4,1.5

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

Update of /cvsroot/artoolkit/artoolkit/examples/paddleInteraction
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21313

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

Index: paddleInteractionTest.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/paddleInteraction/paddleInteractionTest.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** paddleInteractionTest.c	20 Jul 2005 22:32:09 -0000	1.4
--- paddleInteractionTest.c	22 Jul 2005 23:59:20 -0000	1.5
***************
*** 29,33 ****
  
  #ifdef _WIN32
! char			*vconf = "flipV,showDlg"; // see video.h for a list of supported parameters
  #else
  char			*vconf = "";
--- 29,33 ----
  
  #ifdef _WIN32
! char			*vconf = "WDM_camera_flipV.xml";
  #else
  char			*vconf = "";

Index: paddleInteractionTest.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/paddleInteraction/paddleInteractionTest.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** paddleInteractionTest.vcproj	22 Nov 2004 03:37:43 -0000	1.1
--- paddleInteractionTest.vcproj	22 Jul 2005 23:59:20 -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"
***************
*** 30,36 ****
  				Name="VCLinkerTool"
  				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARMultid.lib libARgsubd.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories=""$(ProjectDir)/../../lib""
  				GenerateDebugInformation="TRUE"/>
  			<Tool
--- 30,36 ----
  				Name="VCLinkerTool"
  				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARMultid.lib libARgsubd.lib libARvideod.lib opengl32.lib glu32.lib glut32.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"/>
***************
*** 77,83 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARMulti.lib  libARgsub.lib libARvideo.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)/../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"
--- 77,83 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARMulti.lib  libARgsub.lib libARvideo.lib opengl32.lib glu32.lib glut32.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"