[artoolkit-commits] artoolkit/examples/simple2 simpleTest2.vcproj,1.1.1.1,1.2 simpleTest2.c,1.3,1.4

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

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

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

Index: simpleTest2.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simple2/simpleTest2.vcproj,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** simpleTest2.vcproj	4 Nov 2004 08:51:08 -0000	1.1.1.1
--- simpleTest2.vcproj	22 Jul 2005 23:59:34 -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 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 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 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 libARgsub.lib libARvideo.lib opengl32.lib glu32.lib glut32.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"

Index: simpleTest2.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/examples/simple2/simpleTest2.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** simpleTest2.c	20 Jul 2005 22:29:27 -0000	1.3
--- simpleTest2.c	22 Jul 2005 23:59:34 -0000	1.4
***************
*** 20,24 ****
  
  #ifdef _WIN32
! char			*vconf = "flipV,showDlg"; // see video.h for a list of supported parameters
  #else
  char			*vconf = "";
--- 20,24 ----
  
  #ifdef _WIN32
! char			*vconf = "WDM_camera_flipV.xml";
  #else
  char			*vconf = "";