Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26237
Modified Files:
Configure ARToolKit.sln ARToolKit.dsw README.txt
Log Message:
Multiple changes.
Index: ARToolKit.dsw
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.dsw,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ARToolKit.dsw 4 Nov 2004 08:50:24 -0000 1.1.1.1
--- ARToolKit.dsw 22 Nov 2004 03:41:22 -0000 1.2
***************
*** 67,70 ****
--- 67,91 ----
###############################################################################
+ Project: "collide"=.\examples\collide\collideTest.dsp - Package Owner=<4>
+
+ Package=<5>
+ {{{
+ }}}
+
+ Package=<4>
+ {{{
+ Begin Project Dependency
+ Project_Dep_Name libAR
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARgsub
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARvideo
+ End Project Dependency
+ }}}
+
+ ###############################################################################
+
Project: "exview"=.\examples\exview\exview.dsp - Package Owner=<4>
***************
*** 86,89 ****
--- 107,133 ----
}}}
+
+ ###############################################################################
+
+ Project: "graphicsTest"=.\util\graphicsTest\graphicsTest.dsp - Package Owner=<4>
+
+ Package=<5>
+ {{{
+ }}}
+
+ Package=<4>
+ {{{
+ Begin Project Dependency
+ Project_Dep_Name libAR
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARgsub
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARvideo
+ End Project Dependency
+ }}}
+
+
###############################################################################
***************
*** 158,161 ****
--- 202,227 ----
}}}
+
+ ###############################################################################
+
+ Project: "loadMultiple"=.\examples\loadMultiple\loadMultiple.dsp - Package Owner=<4>
+
+ Package=<5>
+ {{{
+ }}}
+
+ Package=<4>
+ {{{
+ Begin Project Dependency
+ Project_Dep_Name libAR
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARgsub
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARvideo
+ End Project Dependency
+ }}}
+
###############################################################################
***************
*** 181,185 ****
###############################################################################
! Project: "modetest"=.\examples\modeTest\modetest.dsp - Package Owner=<4>
Package=<5>
--- 247,251 ----
###############################################################################
! Project: "modeTest"=.\examples\modeTest\modeTest.dsp - Package Owner=<4>
Package=<5>
***************
*** 200,206 ****
}}}
###############################################################################
! Project: "multi"=.\examples\multi\multi.dsp - Package Owner=<4>
Package=<5>
--- 266,273 ----
}}}
+
###############################################################################
! Project: "multi"=.\examples\multi\multiTest.dsp - Package Owner=<4>
Package=<5>
***************
*** 250,254 ****
###############################################################################
! Project: "relation"=.\examples\relation\relation.dsp - Package Owner=<4>
Package=<5>
--- 317,321 ----
###############################################################################
! Project: "paddle"=.\examples\paddle\paddleTest.dsp - Package Owner=<4>
Package=<5>
***************
*** 265,275 ****
End Project Dependency
Begin Project Dependency
Project_Dep_Name libARvideo
End Project Dependency
}}}
###############################################################################
! Project: "simple"=.\examples\simple\simple.dsp - Package Owner=<4>
Package=<5>
--- 332,346 ----
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name libARgsubUtil
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name libARvideo
End Project Dependency
}}}
+
###############################################################################
! Project: "paddleDemo"=.\examples\paddleDemo\paddleDemo.dsp - Package Owner=<4>
Package=<5>
***************
*** 286,296 ****
End Project Dependency
Begin Project Dependency
Project_Dep_Name libARvideo
End Project Dependency
}}}
###############################################################################
! Project: "simple2"=.\examples\simple2\simple2.dsp - Package Owner=<4>
Package=<5>
--- 357,461 ----
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name libARgsubUtil
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name libARvideo
End Project Dependency
}}}
+
###############################################################################
! Project: "paddleInteraction"=.\examples\paddleInteraction\paddleInteractionTest.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name libAR
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARgsub
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARgsubUtil
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARvideo
! End Project Dependency
! }}}
!
!
! ###############################################################################
!
! Project: "range"=.\examples\range\rangeTest.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name libAR
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARgsub
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARgsubUtil
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARvideo
! End Project Dependency
! }}}
! ###############################################################################
!
! Project: "relation"=.\examples\relation\relationTest.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name libAR
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARgsub
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARvideo
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Project: "simple"=.\examples\simple\simpleTest.dsp - Package Owner=<4>
!
! Package=<5>
! {{{
! }}}
!
! Package=<4>
! {{{
! Begin Project Dependency
! Project_Dep_Name libAR
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARgsub
! End Project Dependency
! Begin Project Dependency
! Project_Dep_Name libARvideo
! End Project Dependency
! }}}
!
! ###############################################################################
!
! Project: "simple2"=.\examples\simple2\simpleTest2.dsp - Package Owner=<4>
Package=<5>
***************
*** 334,337 ****
--- 499,548 ----
###############################################################################
+
+ ###############################################################################
+
+ Project: "twoView"=.\examples\twoView\twoView.dsp - Package Owner=<4>
+
+ Package=<5>
+ {{{
+ }}}
+
+ Package=<4>
+ {{{
+ Begin Project Dependency
+ Project_Dep_Name libAR
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARgsub_lite
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARvideo
+ End Project Dependency
+ }}}
+
+ ###############################################################################
+
+ Project: "videoTest"=.\util\videoTest\videoTest.dsp - Package Owner=<4>
+
+ Package=<5>
+ {{{
+ }}}
+
+ Package=<4>
+ {{{
+ Begin Project Dependency
+ Project_Dep_Name libAR
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARgsub_lite
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name libARvideo
+ End Project Dependency
+ }}}
+
+ ###############################################################################
+
+
Global:
Index: Configure
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/Configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Configure 19 Nov 2004 03:36:54 -0000 1.2
--- Configure 22 Nov 2004 03:41:22 -0000 1.3
***************
*** 13,21 ****
util \
util/calib_camera2 util/calib_cparam util/calib_distortion \
! util/mk_patt \
examples \
! examples/exview examples/modeTest examples/multi \
! examples/optical examples/relation examples/simple examples/simple2 \
! examples/simpleLite \
"
--- 13,22 ----
util \
util/calib_camera2 util/calib_cparam util/calib_distortion \
! util/mk_patt util/graphicsTest util/videoTest \
examples \
! examples/collide examples/exview \
! examples/loadMultiple examples/modeTest examples/multi examples/optical \
! examples/paddle examples/paddleDemo examples/paddleInteraction examples/range \
! examples/relation examples/simple examples/simple2 examples/simpleLite examples/twoView \
"
***************
*** 30,35 ****
echo "Select a video capture driver."
echo " 1: Video4Linux"
! echo " 2: Digital Video Camcoder through IEEE 1394 (DV Format)"
! echo " 3: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)"
echo -n "Enter : "
read ANS
--- 31,37 ----
echo "Select a video capture driver."
echo " 1: Video4Linux"
! echo " 2: Video4Linux+JPEG Decompression (EyeToy)"
! echo " 3: Digital Video Camcoder through IEEE 1394 (DV Format)"
! echo " 4: Digital Video Camera through IEEE 1394 (VGA NONCOMPRESSED Image Format)"
echo -n "Enter : "
read ANS
***************
*** 45,48 ****
--- 47,59 ----
elif [ "$ANS" = "2" ]
then
+ VIDEO_DRIVER="VideoLinuxV4L"
+ CFLAG="-O -I/usr/X11R6/include -DUSE_EYETOY"
+ LDFLAG="-L/usr/X11R6/lib"
+ ARFLAG="rs"
+ RANLIB=""
+ LIBS="-lglut -lGLU -lGL -lXi -lXmu -lX11 -lm -ljpeg"
+ CONFIG="AR_INPUT_V4L"
+ elif [ "$ANS" = "3" ]
+ then
VIDEO_DRIVER="VideoLinuxDV"
CFLAG="-O -I/usr/include/glib-1.2 -I/usr/lib/glib/include -I/usr/X11R6/include"
***************
*** 52,56 ****
LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
CONFIG="AR_INPUT_DV"
! elif [ "$ANS" = "3" ]
then
VIDEO_DRIVER="VideoLinux1394Cam"
--- 63,67 ----
LIBS="-lraw1394 -ldv -lpthread -lglut -lGLU -lGL -lXi -lXmu -lX11 -lm"
CONFIG="AR_INPUT_DV"
! elif [ "$ANS" = "4" ]
then
VIDEO_DRIVER="VideoLinux1394Cam"
***************
*** 65,72 ****
echo -n "Enter : "
read ANS
! if [ "$ANS" = "y" ]
then
DRAGON="y"
! elif [ "$ANS" = "n" ]
then
DRAGON="n"
--- 76,83 ----
echo -n "Enter : "
read ANS
! if ( [ "$ANS" = "y" ] || [ "$ANS" = "Y" ] || [ "$ANS" = "yes" ] || [ "$ANS" = "YES" ])
then
DRAGON="y"
! elif ( [ "$ANS" = "n" ] || [ "$ANS" = "N" ] || [ "$ANS" = "no" ] || [ "$ANS" = "NO" ])
then
DRAGON="n"
***************
*** 77,81 ****
else
! echo "Please enter 1,2 or 3."
exit 0
fi
--- 88,92 ----
else
! echo "Please enter 1,2,3 or 4."
exit 0
fi
***************
*** 103,107 ****
ARFLAG="-r"
RANLIB="ranlib \$\@"
! LIBS=" -framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -lobjc"
echo "Dose your Mac have fast texture mapping hardware? (y or n)"
--- 114,118 ----
ARFLAG="-r"
RANLIB="ranlib \$\@"
! LIBS="-framework Carbon -framework QuickTime -framework GLUT -framework OpenGL -lobjc"
echo "Dose your Mac have fast texture mapping hardware? (y or n)"
***************
*** 128,135 ****
echo -n "Enter : "
read ANS
! if [ "$ANS" = "y" ]
then
NVEXT="y"
! elif [ "$ANS" = "n" ]
then
NVEXT="n"
--- 139,147 ----
echo -n "Enter : "
read ANS
! if ( [ "$ANS" = "y" ] || [ "$ANS" = "Y" ] || [ "$ANS" = "yes" ] || [ "$ANS" = "YES" ])
then
NVEXT="y"
! elif ( [ "$ANS" = "n" ] || [ "$ANS" = "N" ] || [ "$ANS" = "no" ] || [ "$ANS" = "NO" ])
!
then
NVEXT="n"
Index: README.txt
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/README.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** README.txt 19 Nov 2004 03:32:11 -0000 1.2
--- README.txt 22 Nov 2004 03:41:22 -0000 1.3
***************
*** 90,93 ****
--- 90,99 ----
- Added libARvrml.
- Turn off texturing in gsub/gsub_lite when argDrawMode/arglDrawmode is AR_DRAW_BY_GL_DRAW_PIXELS.
+ - Added new examples collide, loadMultiple, paddle, paddleDemo, paddleInteraction, range and twoView.
+ - Added new utilities for testing graphics and video without marker recognition, graphicsTest and videoTest.
+ - VideoLinuxV4L patch by Uwe Woessner for YUV support (at last!)
+ - VideoLinuxV4L patches by Raphael Grasset for improved camera parameter control and compressed jpeg video stream to support Sony Eyetoy camera.
+ - VideoLinux1394Cam patch by Wayne Wayne Piekarski for improved lib1394 support, including multiple lib1394 versions.
+ - Preliminary API documentation by Raphael Grasset.
Index: ARToolKit.sln
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/ARToolKit.sln,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ARToolKit.sln 4 Nov 2004 08:50:27 -0000 1.1.1.1
--- ARToolKit.sln 22 Nov 2004 03:41:22 -0000 1.2
***************
*** 60,64 ****
EndProjectSection
EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}"
ProjectSection(ProjectDependencies) = postProject
{B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
--- 60,64 ----
EndProjectSection
EndProject
! Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "calib_camera2", "util\calib_camera2\calib_camera2.vcproj", "{7218026D-600A-2D4D-C387-44E5B226FA6A}"
ProjectSection(ProjectDependencies) = postProject
{B5E62882-360E-46B2-A97F-50443BB795E3} = {B5E62882-360E-46B2-A97F-50443BB795E3}
***************
*** 103,106 ****
--- 103,146 ----
EndProjectSection
EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "collideTest", "examples\collide\collideTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "loadMultiple", "examples\loadMultiple\loadMultiple.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "modeTest", "examples\modeTest\modeTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleTest", "examples\paddle\paddleTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleDemo", "examples\paddleDemo\paddleDemo.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "paddleInteractionTest", "examples\paddleInteraction\paddleInteractionTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rangeTest", "examples\range\rangeTest.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "twoView", "examples\twoView\twoView.vcproj", "{89E3CB14-46DF-46BB-B87F-CC653045B14C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphicsTest", "util\graphicsTest\graphicsTest.vcproj", "{8C93A102-ABC7-4848-A183-BD1F3471159C}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
+ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "videoTest", "util\videoTest\videoTest.vcproj", "{401D60F6-AF80-481B-A6EB-9FB03130AB1F}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+ EndProject
Global
GlobalSection(SolutionConfiguration) = preSolution
***************
*** 135,138 ****
--- 175,179 ----
{89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
{89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
{591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.ActiveCfg = Debug|Win32
{591A24EE-AE23-7439-B131-D7A75370BFE8}.Debug.Build.0 = Debug|Win32
***************
*** 195,198 ****
--- 236,299 ----
{B5E62882-360E-46B2-A97F-50443BB795E3}.Release.Build.0 = Release|Win32
{B5E62882-360E-46B2-A97F-50443BB795E3}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.ActiveCfg = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Debug.Build.0 = Debug|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release.Build.0 = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).ActiveCfg = Release|Win32
+ {89E3CB14-46DF-46BB-B87F-CC653045B14C}.Release (Intel).Build.0 = Release|Win32
+ {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.ActiveCfg = Debug|Win32
+ {8C93A102-ABC7-4848-A183-BD1F3471159C}.Debug.Build.0 = Debug|Win32
+ {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.ActiveCfg = Release|Win32
+ {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release.Build.0 = Release|Win32
+ {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).ActiveCfg = Release|Win32
+ {8C93A102-ABC7-4848-A183-BD1F3471159C}.Release (Intel).Build.0 = Release|Win32
+ {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.ActiveCfg = Debug|Win32
+ {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Debug.Build.0 = Debug|Win32
+ {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.ActiveCfg = Release|Win32
+ {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release.Build.0 = Release|Win32
+ {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).ActiveCfg = Release|Win32
+ {401D60F6-AF80-481B-A6EB-9FB03130AB1F}.Release (Intel).Build.0 = Release|Win32
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
|