[artoolkit-commits] artoolkit/util/mk_patt mk_patt.c,1.3,1.4 mk_patt.vcproj,1.1.1.1,1.2

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

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

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

Index: mk_patt.c
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mk_patt.c	20 Jul 2005 22:41:33 -0000	1.3
--- mk_patt.c	23 Jul 2005 00:01:56 -0000	1.4
***************
*** 31,35 ****
  #  endif
  #elif defined(_WIN32)
! char			*vconf = "flipV,showDlg";
  #elif defined(__APPLE__)
  char			*vconf = "-width=640 -height=480";
--- 31,35 ----
  #  endif
  #elif defined(_WIN32)
! char			*vconf = "WDM_camera_flipV.xml";
  #elif defined(__APPLE__)
  char			*vconf = "-width=640 -height=480";

Index: mk_patt.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.vcproj,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** mk_patt.vcproj	4 Nov 2004 08:52:15 -0000	1.1.1.1
--- mk_patt.vcproj	23 Jul 2005 00:01:56 -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 libARgsub.lib libARvideo.lib"
! 				OutputFile="$(ProjectDir)/../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)/../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"
--- 78,83 ----
  				Name="VCLinkerTool"
  				AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib"
! 				OutputFile="$(ProjectDir)../../bin/$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)../../lib&quot;"/>
  			<Tool
  				Name="VCMIDLTool"