[artoolkit-commits] artoolkit/util/mk_patt Makefile.in, 1.1.1.1, 1.2 mk_patt.vcproj, 1.3, 1.4 mkpat

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Makefile.in mk_patt.vcproj mkpatt.dsp 
Log Message:
Update for change in mk_patt linkage.

Index: mkpatt.dsp
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mkpatt.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mkpatt.dsp	21 Sep 2005 17:55:16 -0000	1.2
--- mkpatt.dsp	18 Jun 2006 23:25:30 -0000	1.3
***************
*** 52,56 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 libAR.lib libARvideo.lib libARgsub.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\mkpatt.exe" /libpath:"..\..\lib"
  # SUBTRACT LINK32 /nodefaultlib

--- 52,56 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
! # ADD LINK32 libAR.lib libARvideo.lib libARgsub_lite.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 /nodefaultlib:"libc.lib" /out:"..\..\bin\mkpatt.exe" /libpath:"..\..\lib"
  # SUBTRACT LINK32 /nodefaultlib

***************
*** 78,82 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 libARd.lib libARvideod.lib libARgsubd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\mkpattd.exe" /pdbtype:sept /libpath:"..\..\lib"
  # SUBTRACT LINK32 /nodefaultlib

--- 78,82 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 libARd.lib libARvideod.lib libARgsub_lited.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /nodefaultlib:"libcd.lib" /out:"..\..\bin\mkpattd.exe" /pdbtype:sept /libpath:"..\..\lib"
  # SUBTRACT LINK32 /nodefaultlib

Index: Makefile.in
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/Makefile.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile.in	4 Nov 2004 08:52:13 -0000	1.1.1.1
--- Makefile.in	18 Jun 2006 23:25:30 -0000	1.2
***************
*** 4,8 ****

  LDFLAG=@LDFLAG@ -L$(LIB_DIR)
! LIBS= -lARgsub -lARvideo -lAR @LIBS@
  CFLAG= @CFLAG@ -I$(INC_DIR)

--- 4,8 ----

  LDFLAG=@LDFLAG@ -L$(LIB_DIR)
! LIBS= -lARgsub_lite -lARvideo -lAR @LIBS@
  CFLAG= @CFLAG@ -I$(INC_DIR)

Index: mk_patt.vcproj
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/util/mk_patt/mk_patt.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mk_patt.vcproj	21 Sep 2005 17:55:16 -0000	1.3
--- mk_patt.vcproj	18 Jun 2006 23:25:30 -0000	1.4
***************
*** 1,117 ****
! <?xml version="1.0" encoding="Windows-1252"?>
! <VisualStudioProject
! 	ProjectType="Visual C++"
! 	Version="7.10"
! 	Name="mk_patt"
! 	ProjectGUID="{92E9C84C-BADB-EF76-FA80-740BA0F532DF}">
! 	<Platforms>
! 		<Platform
! 			Name="Win32"/>
! 	</Platforms>
! 	<Configurations>
! 		<Configuration
! 			Name="Debug|Win32"
! 			OutputDirectory="Debug"
! 			IntermediateDirectory="Debug"
! 			ConfigurationType="1">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)..\..\include"
! 				PreprocessorDefinitions="WIN32;_DEBUG"
! 				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
! 				BrowseInformation="1"
! 				WarningLevel="3"
! 				DebugInformationFormat="3"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				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"
! 				PreprocessorDefinitions="_DEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 		<Configuration
! 			Name="Release|Win32"
! 			OutputDirectory="Release"
! 			IntermediateDirectory="Release"
! 			ConfigurationType="1"
! 			WholeProgramOptimization="TRUE">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="1"
! 				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)..\..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG"
! 				RuntimeLibrary="0"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARgsub.lib libARvideo.lib"
! 				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 	</Configurations>
! 	<References>
! 	</References>
! 	<Files>
! 		<File
! 			RelativePath="mk_patt.c">
! 		</File>
! 	</Files>
! 	<Globals>
! 	</Globals>
! </VisualStudioProject>
--- 1,117 ----
! <?xml version="1.0" encoding="Windows-1252"?>
! <VisualStudioProject
! 	ProjectType="Visual C++"
! 	Version="7.10"
! 	Name="mk_patt"
! 	ProjectGUID="{92E9C84C-BADB-EF76-FA80-740BA0F532DF}">
! 	<Platforms>
! 		<Platform
! 			Name="Win32"/>
! 	</Platforms>
! 	<Configurations>
! 		<Configuration
! 			Name="Debug|Win32"
! 			OutputDirectory="Debug"
! 			IntermediateDirectory="Debug"
! 			ConfigurationType="1">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				Optimization="0"
! 				AdditionalIncludeDirectories="$(ProjectDir)..\..\include"
! 				PreprocessorDefinitions="WIN32;_DEBUG"
! 				BasicRuntimeChecks="3"
! 				RuntimeLibrary="1"
! 				BrowseInformation="1"
! 				WarningLevel="3"
! 				DebugInformationFormat="3"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalOptions="/DEBUG"
! 				AdditionalDependencies="libARd.lib libARgsub_lited.lib libARvideod.lib"
! 				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName)d.exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"
! 				GenerateDebugInformation="TRUE"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="_DEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 		<Configuration
! 			Name="Release|Win32"
! 			OutputDirectory="Release"
! 			IntermediateDirectory="Release"
! 			ConfigurationType="1"
! 			WholeProgramOptimization="TRUE">
! 			<Tool
! 				Name="VCCLCompilerTool"
! 				GlobalOptimizations="TRUE"
! 				InlineFunctionExpansion="1"
! 				FavorSizeOrSpeed="1"
! 				AdditionalIncludeDirectories="$(ProjectDir)..\..\include"
! 				PreprocessorDefinitions="WIN32;NDEBUG"
! 				RuntimeLibrary="0"/>
! 			<Tool
! 				Name="VCCustomBuildTool"/>
! 			<Tool
! 				Name="VCLinkerTool"
! 				AdditionalDependencies="libAR.lib libARgsub_lite.lib libARvideo.lib"
! 				OutputFile="$(ProjectDir)..\..\bin\$(ProjectName).exe"
! 				AdditionalLibraryDirectories="&quot;$(ProjectDir)..\..\lib&quot;"/>
! 			<Tool
! 				Name="VCMIDLTool"
! 				PreprocessorDefinitions="NDEBUG"
! 				MkTypLibCompatible="TRUE"
! 				SuppressStartupBanner="TRUE"
! 				TargetEnvironment="1"/>
! 			<Tool
! 				Name="VCPostBuildEventTool"/>
! 			<Tool
! 				Name="VCPreBuildEventTool"/>
! 			<Tool
! 				Name="VCPreLinkEventTool"/>
! 			<Tool
! 				Name="VCResourceCompilerTool"/>
! 			<Tool
! 				Name="VCWebServiceProxyGeneratorTool"/>
! 			<Tool
! 				Name="VCXMLDataGeneratorTool"/>
! 			<Tool
! 				Name="VCWebDeploymentTool"/>
! 			<Tool
! 				Name="VCManagedWrapperGeneratorTool"/>
! 			<Tool
! 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
! 		</Configuration>
! 	</Configurations>
! 	<References>
! 	</References>
! 	<Files>
! 		<File
! 			RelativePath="mk_patt.c">
! 		</File>
! 	</Files>
! 	<Globals>
! 	</Globals>
! </VisualStudioProject>

[artoolkit-commits] artoolkit/util/mk_patt Makefile.in, 1.1.1.1, 1.2 mk_patt.vcproj, 1.3, 1.4 mkpat

Optical marker tracking and overlay for augmented reality.

[artoolkit-commits] artoolkit/util/mk_patt Makefile.in, 1.1.1.1, 1.2 mk_patt.vcproj, 1.3, 1.4 mkpatt.dsp, 1.2, 1.3