[artoolkit-commits] artoolkit Configure,1.10,1.11

[Hartmut S. <ret...@us...>]

Update of /cvsroot/artoolkit/artoolkit
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv11928

Modified Files:
	Configure 
Log Message:
- Added an updated CCVT version which hopefully will work as expected on 
x64 systems.



Index: Configure
===================================================================
RCS file: /cvsroot/artoolkit/artoolkit/Configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Configure	18 Sep 2006 04:52:15 -0000	1.10
--- Configure	6 Dec 2006 00:37:23 -0000	1.11
***************
*** 41,44 ****
--- 41,58 ----
      if [ "$ANS" = "1" ]
      then
+ 		echo
+ 		echo "Color conversion should use x86 assembly (choose 'n' for 64bit systems)?"
+  		echo -n "Enter : "
+ 		read ANS
+ 		if [ "$ANS" = "y" ]
+ 		then
+ 			CCVT_OBJ="ccvt_i386.o"
+ 		elif [ "$ANS" = "n" ]
+ 		then
+ 			CCVT_OBJ="ccvt_c.o"
+ 		else
+ 			echo "Please enter y or n."
+ 			exit 0
+ 		fi	
          VIDEO_DRIVER="VideoLinuxV4L"
          CFLAG="-O -I/usr/X11R6/include"
***************
*** 50,53 ****
--- 64,81 ----
      elif [ "$ANS" = "2" ]
      then
+ 		echo
+ 		echo "Color conversion should use x86 assembly (not working for 64bit)?"
+  		echo -n "Enter : "
+ 		read ANS
+ 		if [ "$ANS" = "y" ]
+ 		then
+ 			CCVT_OBJ="ccvt_i386.o"
+ 		elif [ "$ANS" = "n" ]
+ 		then
+ 			CCVT_OBJ="ccvt_c.o"
+ 		else
+ 			echo "Please enter y or n."
+ 			exit 0
+ 		fi		
          VIDEO_DRIVER="VideoLinuxV4L"
          CFLAG="-O -I/usr/X11R6/include -DUSE_EYETOY"
***************
*** 177,180 ****
--- 205,210 ----
  echo $LIBS | sed -e 's/\//\\\//g' >$SED
  LIBS=`cat $SED`
+ echo $CCVT_OBJ | sed -e 's/\//\\\//g' >$SED
+ CCVT_OBJ=`cat $SED`
  
  cat > $SED <<EOF
***************
*** 185,188 ****
--- 215,219 ----
  s/@RANLIB@/$RANLIB/
  s/@LIBS@/$LIBS/
+ s/@CCVT_OBJ@/$CCVT_OBJ/
  EOF