libcvd-members
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[libcvd-members] libcvd Makefile.in configure configure.in cvd/d...


From: Edward Rosten
Subject: [libcvd-members] libcvd Makefile.in configure configure.in cvd/d...
Date: Fri, 13 May 2011 09:56:53 +0000

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        11/05/13 09:56:53

Modified files:
        .              : Makefile.in configure configure.in 
        cvd            : documentation.h 
        make           : compile_deps.awk 
Added files:
        build/vc2008   : config-TooN-JPEG-pthread.h config-TooN.h 
                         libcvd-TooN-JPEG-pthread.vcproj 
                         libcvd-TooN.vcproj 
        make           : libcvd.vcproj.footer libcvd.vcproj.header 
                         make_vcproj.bash make_vcproj_all.sh 
                         make_vcproj_headers.bash 
                         make_vcproj_source.bash 

Log message:
        Some hacks for keeping the Windows project files up to date.
        
        Look in:
        
        make/make_vcproj_all.sh
        
        for examples of how to make project files.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&r1=1.98&r2=1.99
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.161&r2=1.162
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.162&r2=1.163
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/config-TooN-JPEG-pthread.h?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/config-TooN.h?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd-TooN-JPEG-pthread.vcproj?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/build/vc2008/libcvd-TooN.vcproj?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/documentation.h?cvsroot=libcvd&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/compile_deps.awk?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/libcvd.vcproj.footer?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/libcvd.vcproj.header?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/make_vcproj.bash?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/make_vcproj_all.sh?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/make_vcproj_headers.bash?cvsroot=libcvd&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/libcvd/make/make_vcproj_source.bash?cvsroot=libcvd&rev=1.1

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -b -r1.98 -r1.99
--- Makefile.in 11 May 2011 11:06:32 -0000      1.98
+++ Makefile.in 13 May 2011 09:56:52 -0000      1.99
@@ -252,8 +252,6 @@
        cp libcvd_debug.a $(DESTDIR)$(libdir)
 
 
-
-
 clean:
        /bin/rm -f tmp libcvd.a $(sos) libcvd_debug.a $(dsos)
        find . -name '*.o' | xargs rm -f
@@ -314,4 +312,8 @@
 %: %.o
        $(CXX) -o $@ $< $(LDFLAGS) -lcvd  $(LOADLIBES)
 
+printlibs:
+       @echo $(LOADLIBES)
+
+
 include .deps

Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -b -r1.161 -r1.162
--- configure   11 May 2011 11:06:32 -0000      1.161
+++ configure   13 May 2011 09:56:52 -0000      1.162
@@ -666,6 +666,7 @@
 XMKMF
 have_posix_rt
 have_qtbuffer
+have_windows
 have_o2buffer
 have_linux_2_6
 have_linux_2_4
@@ -768,7 +769,7 @@
 with_dc1394v1
 with_dc1394v2
 with_v4l1buffer
-with_v4l2
+with_v4l2buffer
 with_o2buffer
 with_qtbuffer
 with_linux
@@ -6638,9 +6639,9 @@
 fi
 
 
-# Check whether --with-v4l2 was given.
-if test "${with_v4l2+set}" = set; then
-  withval=$with_v4l2;
+# Check whether --with-v4l2buffer was given.
+if test "${with_v4l2buffer+set}" = set; then
+  withval=$with_v4l2buffer;
 fi
 
 
@@ -6970,7 +6971,7 @@
 
 case "$host" in
        *linux*)
-               os_all_options="dc1394v2 dc1394v1 v4l2buffer v4l1buffer 
v4lbuffer"
+               os_all_options="dc1394v2 dc1394v1 v4l2buffer v4l1buffer"
 
                if test "$have_dc1394v2" != yes || test "$with_dc1394v1v2" == 
"yes"
                then
@@ -7793,6 +7794,11 @@
        fi
 
                ;;
+       *windows*)
+               have_windows=yes
+
+               ;;
+
 esac
 
 
@@ -12941,6 +12947,7 @@
 cvd_src/OSX/qtbuffer,cvd_src/OSX/videosource_qtbuffer     qtbuffer
 cvd_src/OSX/videosource_noqtbuffer                                END
 
+cvd_src/cvd_timer                      windows
 cvd_src/posix/timer                                                            
posix_rt
 cvd_src/cvd_timer                                                              
END
 
@@ -12948,17 +12955,24 @@
 cvd_src/synchronized,cvd_src/eventobject,cvd_src/thread                pthread 
END
 cvd_src/thread/runnable_batch                   tr1_shared_ptr pthread
 cvd_src/nothread/runnable_batch                 tr1_shared_ptr END
+
+nothing                                                                        
                windows
 cvd_src/noarch/posix_memalign                   memalign
 cvd_src/noarch/default_memalign                 END
 
+cvd_src/Win32/glwindow,cvd_src/gltext  windows
 cvd_src/videodisplay,cvd_src/glwindow,cvd_src/gltext         videodisplay END
 pnm_src/jpeg                                                                   
jpeg END
 pnm_src/tiff,pnm_src/tiffwrite                                 tiff END
 pnm_src/png                                                                    
        png END
 cvd_src/videofilebuffer,cvd_src/videosource_videofilebuffer     ffmpeg
 cvd_src/videosource_novideofilebuffer           END
+
+nothing                                                                        
                windows
 cvd_src/globlist                                                       glob END
 
+cvd_src/Win32/win32                                                            
windows END
+
 #Numerics dependencies
 cvd_src/tensor_voting,cvd_src/brezenham                        toon END
 cvd_src/draw_toon                                      toon END
@@ -13020,11 +13034,6 @@
 
 
 
-if echo "$dep_objects" | grep -q v4lbuffer
-then
-       options="$options v4lbuffer"
-fi
-
 echo
 echo
 echo Options:

Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -b -r1.162 -r1.163
--- configure.in        11 May 2011 11:06:32 -0000      1.162
+++ configure.in        13 May 2011 09:56:52 -0000      1.163
@@ -413,7 +413,7 @@
 AC_ARG_WITH(dc1394v1,  [  --without-dc1394v1      do not use libDC1394v1 (use 
try v2 instead) for dvbuffer3 (Linux/OSX). Disable dvbuffer (Linux).])
 AC_ARG_WITH(dc1394v2,  [  --without-dc1394v2      do not use libDC1394v2 (use 
try v1 instead) for dvbuffer3 (Linux/OSX). ])
 AC_ARG_WITH(v4l1buffer,[  --without-v4l1buffer   compile without v4l1bffer 
(Video4Linux) support (Linux only)])
-AC_ARG_WITH(v4l2,      [  --without-v4l2buffer   compile without v4l2buffer 
(Video4Linux2) support (Linux only)])
+AC_ARG_WITH(v4l2buffer,[  --without-v4l2buffer   compile without v4l2buffer 
(Video4Linux2) support (Linux only)])
 AC_ARG_WITH(o2buffer,  [  --without-o2buffer     compile without sgi video 
(IRIX only)])
 AC_ARG_WITH(qtbuffer,  [  --without-qtbuffer     compile without quicktime 
buffer support (MacOSX only)])
 
@@ -440,7 +440,7 @@
 
 case "$host" in
        *linux*)
-               os_all_options="dc1394v2 dc1394v1 v4l2buffer v4l1buffer 
v4lbuffer"
+               os_all_options="dc1394v2 dc1394v1 v4l2buffer v4l1buffer"
                
                if test "$have_dc1394v2" != yes || test "$with_dc1394v1v2" == 
"yes"
                then
@@ -542,6 +542,10 @@
                        echo "I hope all SGIs have stuff needed for O2buffer. 
Disable (--without-o2buffer) if I'm wrong."
                ])
                ;;
+       *windows*)
+               AC_SUBST(have_windows, yes)
+               ;;
+               
 esac
 
 
@@ -1019,6 +1023,7 @@
 cvd_src/OSX/qtbuffer,cvd_src/OSX/videosource_qtbuffer     qtbuffer
 cvd_src/OSX/videosource_noqtbuffer                                END 
 
+cvd_src/cvd_timer                      windows
 cvd_src/posix/timer                                                            
posix_rt
 cvd_src/cvd_timer                                                              
END
 
@@ -1026,17 +1031,24 @@
 cvd_src/synchronized,cvd_src/eventobject,cvd_src/thread                pthread 
END
 cvd_src/thread/runnable_batch                   tr1_shared_ptr pthread
 cvd_src/nothread/runnable_batch                 tr1_shared_ptr END
+
+nothing                                                                        
                windows
 cvd_src/noarch/posix_memalign                   memalign
 cvd_src/noarch/default_memalign                 END
 
+cvd_src/Win32/glwindow,cvd_src/gltext  windows
 cvd_src/videodisplay,cvd_src/glwindow,cvd_src/gltext         videodisplay END
 pnm_src/jpeg                                                                   
jpeg END
 pnm_src/tiff,pnm_src/tiffwrite                                 tiff END
 pnm_src/png                                                                    
        png END
 cvd_src/videofilebuffer,cvd_src/videosource_videofilebuffer     ffmpeg 
 cvd_src/videosource_novideofilebuffer           END
+
+nothing                                                                        
                windows
 cvd_src/globlist                                                       glob END
 
+cvd_src/Win32/win32                                                            
windows END
+
 #Numerics dependencies
 cvd_src/tensor_voting,cvd_src/brezenham                        toon END
 cvd_src/draw_toon                                      toon END
@@ -1092,11 +1104,6 @@
 AC_SUBST(testprogs, ["`cat config.dep_testprogs | tr '\n' ' ' `"])
 
 
-if echo "$dep_objects" | grep -q v4lbuffer
-then
-       APPEND(options, v4lbuffer)      
-fi
-
 echo
 echo
 echo Options:

Index: cvd/documentation.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/documentation.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- cvd/documentation.h 1 Apr 2011 17:18:20 -0000       1.29
+++ cvd/documentation.h 13 May 2011 09:56:52 -0000      1.30
@@ -51,6 +51,7 @@
                        - FITS 
                        - PS   (saving only)
                        - EPS  (saving only)
+                       - CVD (a custom type which supports fast, lossless 
compression of greyscale, RGB and Bayer images)
                - External libraries required
                        - JPEG
                        - TIFF 
@@ -102,22 +103,26 @@
   
   -Well tested (current):
        - Linux: x86, x86-64
-       - Linux: ARM LPC3180, XScale (cross compile)
-       - uCLinux: Blackfin  (cross compile)
-       - FreeBSD: x86
-       - OpenBSD: XScale
-       - Mac OS X: x86, PPC
+       - Mac OS X: x86
                - Supports the OSX build environment including:
                        - Frameworks
                        - .dylib libraries
+       - iOS
+               - XCode project provided
        - Cygwin: x86
        - MinGW: x86 (native and cross compile)
-       - Win32: Visual Studio 2008, 2005
+       - Win32: Visual Studio 2008
 
   -Has worked on (current status unknown):
        - Linux: PPC
+       - Mac OS X: PPC
        - Solaris: SPARC
        - IRIX SGI O2: MIPS
+       - Linux: ARM LPC3180, XScale (cross compile)
+       - uCLinux: Blackfin  (cross compile)
+       - FreeBSD: x86
+       - OpenBSD: XScale
+       - Win32: Visual Studio 2005 (project file is out of date)
 
 
 \section Compiling
@@ -129,7 +134,7 @@
        make install
 @endcode
 
-libCVD fully supports parallel builds (<code>make -j2</code> for instance).
+libCVD fully supports parallel builds (<code>make -j48</code> for instance).
 
 \subsection slBugs Library bugs/issues
        There are a few known library bugs which prevent the libraries working 
with libCVD
@@ -150,31 +155,60 @@
                - Remove <code>cvd_src/videosource.o</code> from 
<code>Makefile</code> and use <code>--disable-jpeg</code>
                - Compile files with -O2 instead of -O3
 
+\subsection iOS iOS
+
+An xcode project is provided in the \c build directory
+
 \subsection win32 Windows
 
 For Win32 systems, the @c build directory contains project files for different 
versions
-of Visual Studio. Currently the vc2008 solutin is supported and should work 
out of the box. There
-are two projects, one for compiling libcvd and one for installing it into a 
common directory tree.
-Both projects assume the existence of three environment variables describing 
the location of header, 
+of Visual Studio. Currently the vc2008 solutions are supported and should work 
out of the box. 
+
+libCVD requires the <a 
href="http://www.microsoft.com/downloads/en/details.aspx?FamilyId=D466226B-8DAB-445F-A7B4-448B326C48E7&displaylang=en";>Visual
 Studio feature pack for TR1</a> support.
+
+There are several projects which can be compiled:
+
+- libcvd-TooN A very basic configuration which only requires the <a 
href="http://mi.eng.cam.ac.uk/~er258/cvd/toon.html";>TooN</a> headers. You must 
add the TooN
+  directory to the include path using: 
+    - (Popup Menu) Project Properties -> (Dialog) Configuration -> C/C++ -> 
Common : Additional Include Directories
+
+- libcvd-TooN-JPEG-pthreads This is a more featureful configuration which has 
JPEG and threading support. In order to compile
+  CVD, you must first compile these libraries:
+       - pthreads-win32 at http://sourceware.org/pthreads-win32/
+       - jpeg at http://www.ijg.org/
+
+In order to avoid the need to set up a large number of include paths, all 
libCVD
+projects assume the existence of three environment variables describing the 
location of header, 
 library and binary files (for DLLs).
        
        - @c INCLUDEDIR contains the header files. libcvd headers will be 
copied into @c \%INCLUDEDIR%\\\libcvd
        - @c LIBDIR contains library files. libcvd static libraries (debug and 
release verions) will be copied into @c \%LIBDIR\%
        - @c BINDIR is not used for libcvd, but would be the default directory 
for DLLs
 
-libCVD requires the <a 
href="http://www.microsoft.com/downloads/en/details.aspx?FamilyId=D466226B-8DAB-445F-A7B4-448B326C48E7&displaylang=en";>Visual
 Studio feature pack for TR1</a> support.
+To use this feature, make a directory tree containing (for example):
 
-libCVD requires at least two libraries to compile:
-       - pthreads-win32 at http://sourceware.org/pthreads-win32/
-       - jpeg-7 at http://www.ijg.org/
+- C:\\local\\include
+- C:\\local\\bin
+- C:\\local\\lib
+
+Then set up three environment variables (e.g. using <a 
href="http://www.rapidee.com/en/about";>rapidee</a>) to be the following:
+- INCLUDEDIR=C:\\local\\include
+- BINDIR=C:\\local\\bin
+- LIBDIR=C:\\local\\lib
+
+libCVD will then find all headers and libraries in that directory tree. LibCVD 
also includes the file:
+- install.vcproj
 
-Both libraries should be moved into the directory tree described by @c 
INCLUDEDIR, @c LIBDIR and @c BINDIR where the libCVD 
-project files will expect them.
+This will copy the relevant files into that tree.
 
 libCVD compiles to static libraries for simpler linking and to avoid the 
_dllexport/_dllimport statements throughout the code.
 
-Configuration of features is manual through a default config file in @c 
build/vc2005/config.h. Edit this file to change your configuration, 
-for example to support other image formats such as PNG.
+Configuration of features is manual through a default config file in @c 
build/vs2008/config-*.h. Edit this file to change your configuration, 
+for example to support other image formats such as PNG. Alternatively, new 
configurations can be generated using the file:
+
+- make/make_vcproj_all.sh
+
+from any unix-like environment (including MINGW and Cygwin).
 
 */
 

Index: make/compile_deps.awk
===================================================================
RCS file: /cvsroot/libcvd/libcvd/make/compile_deps.awk,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- make/compile_deps.awk       28 Feb 2008 00:27:24 -0000      1.1
+++ make/compile_deps.awk       13 May 2011 09:56:52 -0000      1.2
@@ -15,10 +15,13 @@
 
        selected= ($NF != "END")
 
+       if($1 != "nothing")
+       {
        nd = split($1, dependees, ",")
        
        for(i=1; i <= nd; i++)
                print dependees[i]
+       }
 }
 
 $NF=="END"{

Index: build/vc2008/config-TooN-JPEG-pthread.h
===================================================================
RCS file: build/vc2008/config-TooN-JPEG-pthread.h
diff -N build/vc2008/config-TooN-JPEG-pthread.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ build/vc2008/config-TooN-JPEG-pthread.h     13 May 2011 09:56:52 -0000      
1.1
@@ -0,0 +1,58 @@
+#ifndef CVD_CONFIG_H
+#define CVD_CONFIG_H
+#define CVD_ARCH_LITTLE_ENDIAN 1
+#ifndef CVD_DISABLE_CPU_x86_64
+    #define CVD_HAVE_CPU_x86_64 1
+#endif
+#ifndef CVD_DISABLE_FENV_H
+    #define CVD_HAVE_FENV_H 1
+#endif
+#ifndef CVD_DISABLE_GLOB
+    #define CVD_HAVE_GLOB 1
+#endif
+#ifndef CVD_DISABLE_JPEG
+    #define CVD_HAVE_JPEG 1
+#endif
+#ifndef CVD_DISABLE_MEMALIGN
+    #define CVD_HAVE_MEMALIGN 1
+#endif
+#ifndef CVD_DISABLE_MMX
+    #define CVD_HAVE_MMX 1
+#endif
+#ifndef CVD_DISABLE_MMXEXT
+    #define CVD_HAVE_MMXEXT 1
+#endif
+#ifndef CVD_DISABLE_POSIX_RT
+    #define CVD_HAVE_POSIX_RT 1
+#endif
+#ifndef CVD_DISABLE_PTHREAD
+    #define CVD_HAVE_PTHREAD 1
+#endif
+#ifndef CVD_DISABLE_PTHREAD_YIELD
+    #define CVD_HAVE_PTHREAD_YIELD 1
+#endif
+#ifndef CVD_DISABLE_SSE
+    #define CVD_HAVE_SSE 1
+#endif
+#ifndef CVD_DISABLE_SSE2
+    #define CVD_HAVE_SSE2 1
+#endif
+#ifndef CVD_DISABLE_SSE3
+    #define CVD_HAVE_SSE3 1
+#endif
+#ifndef CVD_DISABLE_TOON
+    #define CVD_HAVE_TOON 1
+#endif
+#ifndef CVD_DISABLE_TR1_SHARED_PTR
+    #define CVD_HAVE_TR1_SHARED_PTR 1
+#endif
+#ifndef CVD_DISABLE_VIDEODISPLAY
+    #define CVD_HAVE_VIDEODISPLAY 1
+#endif
+#ifndef CVD_DISABLE_YV402P_MMX
+    #define CVD_INTERNAL_HAVE_YV402P_MMX 1
+#endif
+#define CVD_INTERNAL_JPEG_BUFFER_SIZE 1
+#define CVD_MAJOR_VERSION 0
+#define CVD_MINOR_VERSION 8
+#endif

Index: build/vc2008/config-TooN.h
===================================================================
RCS file: build/vc2008/config-TooN.h
diff -N build/vc2008/config-TooN.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ build/vc2008/config-TooN.h  13 May 2011 09:56:52 -0000      1.1
@@ -0,0 +1,54 @@
+#ifndef CVD_CONFIG_H
+#define CVD_CONFIG_H
+#define CVD_ARCH_LITTLE_ENDIAN 1
+#ifndef CVD_DISABLE_CPU_x86_64
+    #define CVD_HAVE_CPU_x86_64 1
+#endif
+#ifndef CVD_DISABLE_FENV_H
+    #define CVD_HAVE_FENV_H 1
+#endif
+#ifndef CVD_DISABLE_GLOB
+    #define CVD_HAVE_GLOB 1
+#endif
+#ifndef CVD_DISABLE_MEMALIGN
+    #define CVD_HAVE_MEMALIGN 1
+#endif
+#ifndef CVD_DISABLE_MMX
+    #define CVD_HAVE_MMX 1
+#endif
+#ifndef CVD_DISABLE_MMXEXT
+    #define CVD_HAVE_MMXEXT 1
+#endif
+#ifndef CVD_DISABLE_POSIX_RT
+    #define CVD_HAVE_POSIX_RT 1
+#endif
+#ifndef CVD_DISABLE_PTHREAD
+    #define CVD_HAVE_PTHREAD 1
+#endif
+#ifndef CVD_DISABLE_PTHREAD_YIELD
+    #define CVD_HAVE_PTHREAD_YIELD 1
+#endif
+#ifndef CVD_DISABLE_SSE
+    #define CVD_HAVE_SSE 1
+#endif
+#ifndef CVD_DISABLE_SSE2
+    #define CVD_HAVE_SSE2 1
+#endif
+#ifndef CVD_DISABLE_SSE3
+    #define CVD_HAVE_SSE3 1
+#endif
+#ifndef CVD_DISABLE_TOON
+    #define CVD_HAVE_TOON 1
+#endif
+#ifndef CVD_DISABLE_TR1_SHARED_PTR
+    #define CVD_HAVE_TR1_SHARED_PTR 1
+#endif
+#ifndef CVD_DISABLE_VIDEODISPLAY
+    #define CVD_HAVE_VIDEODISPLAY 1
+#endif
+#ifndef CVD_DISABLE_YV402P_MMX
+    #define CVD_INTERNAL_HAVE_YV402P_MMX 1
+#endif
+#define CVD_MAJOR_VERSION 0
+#define CVD_MINOR_VERSION 8
+#endif

Index: build/vc2008/libcvd-TooN-JPEG-pthread.vcproj
===================================================================
RCS file: build/vc2008/libcvd-TooN-JPEG-pthread.vcproj
diff -N build/vc2008/libcvd-TooN-JPEG-pthread.vcproj
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ build/vc2008/libcvd-TooN-JPEG-pthread.vcproj        13 May 2011 09:56:52 
-0000      1.1
@@ -0,0 +1,957 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="libcvd"
+       ProjectGUID="{DB1962D5-5EBB-499D-9F84-4FCF6435063C}"
+       RootNamespace="libcvd"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="0"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               WholeProgramOptimization="false"
+                               
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               EnableEnhancedInstructionSet="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                               DisableSpecificWarnings="4244"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               AdditionalDependencies="jpeg.lib 
pthreadVCE2.lib Ws2_32.lib"
+                               OutputFile="..\..\lib\$(ProjectName)d.lib"
+                               
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="0"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="2"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4244"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               AdditionalDependencies="jpeg.lib 
pthreadVCE2.lib Ws2_32.lib"
+                               OutputFile="..\..\lib\$(ProjectName).lib"
+                               
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath="..\..\cvd_src\bayer.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\brezenham.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\colourspace_convert.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\connected_components.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\convolution.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\cvd_timer.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\deinterlacebuffer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\diskbuffer2.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\draw.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\draw_toon.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\eventobject.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\exceptions.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\fast_corner.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\fast_corner_9_nonmax.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\faster_corner_10.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\faster_corner_12.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\faster_corner_9.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\gltext.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\image_io.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\morphology.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\nonmax_suppression.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\thread\runnable_batch.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\slower_corner_11.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\slower_corner_7.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\slower_corner_8.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\synchronized.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\tensor_voting.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\thread.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\timeddiskbuffer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\videosource.cpp"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\videosource_nodvbuffer.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\videosource_novideofilebuffer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\yuv411_to_stuff.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\yuv420.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\yuv422.cpp"
+                               >
+                       </File>
+                       <Filter
+                               Name="fast"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_10_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_10_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_11_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_11_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_12_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_12_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_7_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_7_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_8_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_8_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_9_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_9_score.cxx"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="i686"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\convolve_gaussian.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\gradient.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\median_3x3.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\utility_byte_differences.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\utility_double_int.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\utility_float.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="noarch"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\noarch\convert_rgb_to_y.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\noarch\yuv422_wrapper.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="pnm_src"
+                               >
+                               <File
+                                       RelativePath="..\..\pnm_src\bmp.cxx"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\bmp_read.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\bmp_write.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\cvdimage.cxx"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\fits.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\fitswrite.cc"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\jpeg.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\pnm_grok.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\save_postscript.cxx"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\text.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\text_write.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="Win32"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\Win32\glwindow.cpp"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\Win32\win32.cpp"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="Linux"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\Linux\videosource_nov4l1buffer.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\Linux\videosource_nov4lbuffer.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="OSX"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\OSX\videosource_noqtbuffer.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="SSE"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\SSE2\half_sample.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\SSE2\two_thirds_sample.cc"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath="..\..\cvd\abs.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\argb.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\bgrx.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\bresenham.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\brezenham.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\byte.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\camera.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspace.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspace_convert.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspace_frame.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspacebuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspaces.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="config-TooN-JPEG-pthread.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="copy 
&quot;$(InputPath)&quot; &quot;$(InputDir)..\..\cvd\config.h&quot;&#x0D;&#x0A;"
+                                               
Outputs="&quot;$(InputDir)..\..\cvd\config.h&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="copy 
&quot;$(InputPath)&quot; &quot;$(InputDir)..\..\cvd\config.h&quot;&#x0D;&#x0A;"
+                                               
Outputs="&quot;$(InputDir)..\..\cvd\config.h&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\connected_components.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\convolution.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\cpu_hacks.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\cvd_image.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\cvd_timer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\deinterlacebuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\deinterlaceframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\diskbuffer2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\diskbuffer2_frame.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\documentation.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\draw.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\eventobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\exceptions.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\fast_corner.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\gl_helpers.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\gles1_helpers.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\glwindow.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\haar.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\harris_corner.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\helpers.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_convert.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_convert_fwd.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_interpolate.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_io.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_ref.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\integral_image.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\interpolate.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\irls.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\la.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\localvideobuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\localvideoframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\message_queue.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\morphology.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\nonmax_suppression.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\random.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\readaheadvideobuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\rgb.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\rgb8.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\rgba.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\ringbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\runnable.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\runnable_batch.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\se2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\se3.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\serverpushjpegbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\serverpushjpegframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\so2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\so3.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\synchronized.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\tensor_voting.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\thread.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\timeddiskbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\timer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\utility.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\vector_image_ref.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videobuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videobufferflags.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videobufferwithdata.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videodisplay.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videofilebuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videofilebuffer_frame.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videoframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videosource.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\vision.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\vision_exceptions.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\wls.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\wls_c.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\wls_cholesky.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\yc.h"
+                               >
+                       </File>
+                       <Filter
+                               Name="internal"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd\internal\aligned_mem.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\assembly.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\bmp.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\builtin_components.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\convert_pixel_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\cvdimage.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\disk_image.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\fits.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\gl_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\gles1_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\is_pod.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\jpeg.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\load_and_save.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\name_CVD_rgb_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\name_builtin_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\parameter.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\pixel_operations.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\pixel_traits.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\png.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\pnm_grok.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\rgb_components.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\save_postscript.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\scalar_convert.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\simple_vector.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\text.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\tiff.h"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

Index: build/vc2008/libcvd-TooN.vcproj
===================================================================
RCS file: build/vc2008/libcvd-TooN.vcproj
diff -N build/vc2008/libcvd-TooN.vcproj
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ build/vc2008/libcvd-TooN.vcproj     13 May 2011 09:56:52 -0000      1.1
@@ -0,0 +1,953 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="libcvd"
+       ProjectGUID="{DB1962D5-5EBB-499D-9F84-4FCF6435063C}"
+       RootNamespace="libcvd"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="0"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               WholeProgramOptimization="false"
+                               
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               EnableEnhancedInstructionSet="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                               DisableSpecificWarnings="4244"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               AdditionalDependencies=" Ws2_32.lib"
+                               OutputFile="..\..\lib\$(ProjectName)d.lib"
+                               
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="0"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="2"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4244"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               AdditionalDependencies=" Ws2_32.lib"
+                               OutputFile="..\..\lib\$(ProjectName).lib"
+                               
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+                       <File
+                               RelativePath="..\..\cvd_src\bayer.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\brezenham.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\colourspace_convert.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\connected_components.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\convolution.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\cvd_timer.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\deinterlacebuffer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\diskbuffer2.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\draw.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\draw_toon.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\eventobject.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\exceptions.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\fast_corner.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\fast_corner_9_nonmax.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\faster_corner_10.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\faster_corner_12.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\faster_corner_9.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\gltext.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\image_io.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\morphology.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\nonmax_suppression.cxx"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\thread\runnable_batch.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\slower_corner_11.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\slower_corner_7.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\slower_corner_8.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\synchronized.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\tensor_voting.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\thread.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\timeddiskbuffer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\videosource.cpp"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\videosource_nodvbuffer.cc"
+                               >
+                       </File>
+                       <File
+                               
RelativePath="..\..\cvd_src\videosource_novideofilebuffer.cc"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\yuv411_to_stuff.cxx"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\yuv420.cpp"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd_src\yuv422.cpp"
+                               >
+                       </File>
+                       <Filter
+                               Name="fast"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_10_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_10_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_11_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_11_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_12_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_12_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_7_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_7_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_8_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_8_score.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_9_detect.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\fast\fast_9_score.cxx"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="i686"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\convolve_gaussian.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\gradient.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\median_3x3.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\utility_byte_differences.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\utility_double_int.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\i686\utility_float.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="noarch"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\noarch\convert_rgb_to_y.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\noarch\yuv422_wrapper.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="pnm_src"
+                               >
+                               <File
+                                       RelativePath="..\..\pnm_src\bmp.cxx"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\bmp_read.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\bmp_write.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\cvdimage.cxx"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\fits.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\fitswrite.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\pnm_grok.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\save_postscript.cxx"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\..\pnm_src\text.cxx"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\pnm_src\text_write.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="Win32"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\Win32\glwindow.cpp"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\Win32\win32.cpp"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="Linux"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\Linux\videosource_nov4l1buffer.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\Linux\videosource_nov4lbuffer.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="OSX"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\OSX\videosource_noqtbuffer.cc"
+                                       >
+                               </File>
+                       </Filter>
+                       <Filter
+                               Name="SSE"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd_src\SSE2\half_sample.cc"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd_src\SSE2\two_thirds_sample.cc"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+                       <File
+                               RelativePath="..\..\cvd\abs.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\argb.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\bgrx.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\bresenham.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\brezenham.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\byte.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\camera.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspace.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspace_convert.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspace_frame.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspacebuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\colourspaces.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="config-TooN.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="copy 
&quot;$(InputPath)&quot; &quot;$(InputDir)..\..\cvd\config.h&quot;&#x0D;&#x0A;"
+                                               
Outputs="&quot;$(InputDir)..\..\cvd\config.h&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="copy 
&quot;$(InputPath)&quot; &quot;$(InputDir)..\..\cvd\config.h&quot;&#x0D;&#x0A;"
+                                               
Outputs="&quot;$(InputDir)..\..\cvd\config.h&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\connected_components.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\convolution.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\cpu_hacks.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\cvd_image.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\cvd_timer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\deinterlacebuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\deinterlaceframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\diskbuffer2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\diskbuffer2_frame.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\documentation.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\draw.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\eventobject.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\exceptions.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\fast_corner.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\gl_helpers.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\gles1_helpers.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\glwindow.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\haar.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\harris_corner.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\helpers.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_convert.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_convert_fwd.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_interpolate.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_io.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\image_ref.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\integral_image.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\interpolate.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\irls.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\la.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\localvideobuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\localvideoframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\message_queue.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\morphology.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\nonmax_suppression.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\random.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\readaheadvideobuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\rgb.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\rgb8.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\rgba.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\ringbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\runnable.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\runnable_batch.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\se2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\se3.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\serverpushjpegbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\serverpushjpegframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\so2.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\so3.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\synchronized.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\tensor_voting.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\thread.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\timeddiskbuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\timer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\utility.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\vector_image_ref.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videobuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videobufferflags.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videobufferwithdata.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videodisplay.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videofilebuffer.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videofilebuffer_frame.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videoframe.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\videosource.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\vision.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\vision_exceptions.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\wls.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\wls_c.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\wls_cholesky.h"
+                               >
+                       </File>
+                       <File
+                               RelativePath="..\..\cvd\yc.h"
+                               >
+                       </File>
+                       <Filter
+                               Name="internal"
+                               >
+                               <File
+                                       
RelativePath="..\..\cvd\internal\aligned_mem.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\assembly.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\bmp.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\builtin_components.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\convert_pixel_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\cvdimage.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\disk_image.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\fits.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\gl_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\gles1_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\is_pod.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\jpeg.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\load_and_save.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\name_CVD_rgb_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\name_builtin_types.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\parameter.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\pixel_operations.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\pixel_traits.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\png.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\pnm_grok.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\rgb_components.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\save_postscript.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\scalar_convert.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\simple_vector.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\text.h"
+                                       >
+                               </File>
+                               <File
+                                       
RelativePath="..\..\cvd\internal\io\tiff.h"
+                                       >
+                               </File>
+                       </Filter>
+               </Filter>
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

Index: make/libcvd.vcproj.footer
===================================================================
RCS file: make/libcvd.vcproj.footer
diff -N make/libcvd.vcproj.footer
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make/libcvd.vcproj.footer   13 May 2011 09:56:52 -0000      1.1
@@ -0,0 +1,4 @@
+       </Files>
+       <Globals>
+       </Globals>
+</VisualStudioProject>

Index: make/libcvd.vcproj.header
===================================================================
RCS file: make/libcvd.vcproj.header
diff -N make/libcvd.vcproj.header
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make/libcvd.vcproj.header   13 May 2011 09:56:53 -0000      1.1
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+       ProjectType="Visual C++"
+       Version="9.00"
+       Name="libcvd"
+       ProjectGUID="{DB1962D5-5EBB-499D-9F84-4FCF6435063C}"
+       RootNamespace="libcvd"
+       Keyword="Win32Proj"
+       TargetFrameworkVersion="131072"
+       >
+       <Platforms>
+               <Platform
+                       Name="Win32"
+               />
+       </Platforms>
+       <ToolFiles>
+       </ToolFiles>
+       <Configurations>
+               <Configuration
+                       Name="Debug|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="0"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               Optimization="0"
+                               WholeProgramOptimization="false"
+                               
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
+                               PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+                               MinimalRebuild="true"
+                               BasicRuntimeChecks="3"
+                               RuntimeLibrary="3"
+                               EnableEnhancedInstructionSet="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="4"
+                               DisableSpecificWarnings="4244"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               AdditionalDependencies="XXXLIBSXXX Ws2_32.lib"
+                               OutputFile="..\..\lib\$(ProjectName)d.lib"
+                               
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+               <Configuration
+                       Name="Release|Win32"
+                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+                       IntermediateDirectory="$(ConfigurationName)"
+                       ConfigurationType="4"
+                       CharacterSet="0"
+                       WholeProgramOptimization="0"
+                       >
+                       <Tool
+                               Name="VCPreBuildEventTool"
+                       />
+                       <Tool
+                               Name="VCCustomBuildTool"
+                       />
+                       <Tool
+                               Name="VCXMLDataGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCWebServiceProxyGeneratorTool"
+                       />
+                       <Tool
+                               Name="VCMIDLTool"
+                       />
+                       <Tool
+                               Name="VCCLCompilerTool"
+                               InlineFunctionExpansion="2"
+                               FavorSizeOrSpeed="1"
+                               WholeProgramOptimization="false"
+                               
AdditionalIncludeDirectories="..\..;&quot;$(INCLUDEDIR)&quot;"
+                               PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+                               RuntimeLibrary="2"
+                               EnableEnhancedInstructionSet="2"
+                               UsePrecompiledHeader="0"
+                               WarningLevel="3"
+                               DebugInformationFormat="3"
+                               DisableSpecificWarnings="4244"
+                       />
+                       <Tool
+                               Name="VCManagedResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCResourceCompilerTool"
+                       />
+                       <Tool
+                               Name="VCPreLinkEventTool"
+                       />
+                       <Tool
+                               Name="VCLibrarianTool"
+                               AdditionalDependencies="XXXLIBSXXX Ws2_32.lib"
+                               OutputFile="..\..\lib\$(ProjectName).lib"
+                               
AdditionalLibraryDirectories="&quot;$(LIBDIR)&quot;"
+                       />
+                       <Tool
+                               Name="VCALinkTool"
+                       />
+                       <Tool
+                               Name="VCXDCMakeTool"
+                       />
+                       <Tool
+                               Name="VCBscMakeTool"
+                       />
+                       <Tool
+                               Name="VCFxCopTool"
+                       />
+                       <Tool
+                               Name="VCPostBuildEventTool"
+                       />
+               </Configuration>
+       </Configurations>
+       <References>
+       </References>
+       <Files>

Index: make/make_vcproj.bash
===================================================================
RCS file: make/make_vcproj.bash
diff -N make/make_vcproj.bash
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make/make_vcproj.bash       13 May 2011 09:56:53 -0000      1.1
@@ -0,0 +1,31 @@
+#
+#
+#
+if [ "$1" == "" ]
+then
+       echo Please specify configuration name
+    echo Please use a configuration like this:
+       echo ./configure --without-lapack --without-png --without-tiff  
--without-dc1394v1 --without-dc1394v2 --without-assembler --without-inline_asm 
--host x86_64-windows
+       exit
+fi
+
+echo ... $*
+
+n="$1"
+shift
+
+if [ "$#" == 0 ]
+then
+       echo Please specify the libraries that visual studio will use
+       exit
+fi
+
+make clean
+
+sed -e"s!XXXLIBSXXX!$*!"  make/libcvd.vcproj.header   \
+                                         > "build/vc2008/libcvd-$n.vcproj"
+bash make/make_vcproj_source.bash       >> "build/vc2008/libcvd-$n.vcproj"
+bash make/make_vcproj_headers.bash "$n" >> "build/vc2008/libcvd-$n.vcproj"
+cat make/libcvd.vcproj.footer           >> "build/vc2008/libcvd-$n.vcproj"
+
+cp cvd/config.h                            "build/vc2008/config-$n.h"

Index: make/make_vcproj_all.sh
===================================================================
RCS file: make/make_vcproj_all.sh
diff -N make/make_vcproj_all.sh
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make/make_vcproj_all.sh     13 May 2011 09:56:53 -0000      1.1
@@ -0,0 +1,6 @@
+./configure --host x86_64-windows --without-lapack --without-png 
--without-tiff --without-dc1394v1 --without-dc1394v2 --without-inline_asm 
--without-assembler
+bash make/make_vcproj.bash TooN-JPEG-pthread jpeg.lib pthreadVCE2.lib
+
+./configure --host x86_64-windows --without-lapack --without-png 
--without-tiff --without-dc1394v1 --without-dc1394v2 --without-inline_asm 
--without-assembler --without-jpeg 
+bash make/make_vcproj.bash TooN  ""
+

Index: make/make_vcproj_headers.bash
===================================================================
RCS file: make/make_vcproj_headers.bash
diff -N make/make_vcproj_headers.bash
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make/make_vcproj_headers.bash       13 May 2011 09:56:53 -0000      1.1
@@ -0,0 +1,71 @@
+function process()
+{
+       #Sort the files by filename ignoring the directories, to match the VS 
default
+       awk -F/ '{print $(NF),$0}' | sort | awk -vd=$1 -vconfig="$config" '
+
+       BEGIN{
+               prefix="\"..\\..\\"
+               tabs=""
+               for(i=0; i < d; i++)
+                       tabs = tabs "   "
+       }
+       /config.h/{
+               print config
+               next
+       }
+       {
+               gsub(/\//, "\\")
+               print tabs "                    <File"
+               print tabs "                            RelativePath=" prefix 
$2 "\""
+               print tabs "                            >"
+               print tabs "                    </File>"
+       }'
+}
+
+config='                       <File
+                               RelativePath="config-'"$1"'.h"
+                               >
+                               <FileConfiguration
+                                       Name="Debug|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="copy 
&quot;$(InputPath)&quot; 
&quot;$(InputDir)..\\..\\cvd\\config.h&quot;&#x0D;&#x0A;"
+                                               
Outputs="&quot;$(InputDir)..\\..\\cvd\\config.h&quot;"
+                                       />
+                               </FileConfiguration>
+                               <FileConfiguration
+                                       Name="Release|Win32"
+                                       >
+                                       <Tool
+                                               Name="VCCustomBuildTool"
+                                               CommandLine="copy 
&quot;$(InputPath)&quot; 
&quot;$(InputDir)..\\..\\cvd\\config.h&quot;&#x0D;&#x0A;"
+                                               
Outputs="&quot;$(InputDir)..\\..\\cvd\\config.h&quot;"
+                                       />
+                               </FileConfiguration>
+                       </File>'
+
+
+
+cat << FOO
+               <Filter
+                       Name="Header Files"
+                       Filter="h;hpp;hxx;hm;inl;inc;xsd"
+                       
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+                       >
+FOO
+
+find cvd -name *.h | grep -v -e internal -e Linux -e IRIX -e OSX -e python | 
process 0
+
+cat << FOO
+                       <Filter
+                               Name="internal"
+                               >
+FOO
+
+find cvd/internal -name *.h | process 1
+
+cat  <<FOO
+                       </Filter>
+               </Filter>
+FOO

Index: make/make_vcproj_source.bash
===================================================================
RCS file: make/make_vcproj_source.bash
diff -N make/make_vcproj_source.bash
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ make/make_vcproj_source.bash        13 May 2011 09:56:53 -0000      1.1
@@ -0,0 +1,65 @@
+function process()
+{
+       d=0
+       if [ "$1" != "" ]
+       then
+               d=1
+cat << FOO
+                       <Filter
+                               Name="$1"
+                               >
+FOO
+       fi
+
+       #Sort the files by filename ignoring the directories, to match the VS 
default
+       awk -F/ '{print $(NF),$0}' | sort | awk -vd=$d -vconfig="$config" '
+
+       BEGIN{
+               prefix="\"..\\..\\"
+               tabs=""
+               for(i=0; i < d; i++)
+                       tabs = tabs "   "
+       }
+       /config.h/{
+               print config
+               next
+       }
+       {
+               gsub(/\//, "\\")
+               print tabs "                    <File"
+               print tabs "                            RelativePath=" prefix 
$2 "\""
+               print tabs "                            >"
+               print tabs "                    </File>"
+       }'
+
+       if [ "$1" != "" ]
+       then
+               echo '                  </Filter>'
+       fi
+}
+
+
+cat << FOO
+               <Filter
+                       Name="Source Files"
+                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+                       
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+                       >
+FOO
+
+make -n libcvd.a | grep g++ | grep -v -e Linux -e SSE -e OSX -e Win32 -e 
noarch -e pnm_src -e /fast/ -e i686 | awk '{print $(NF-2)}' | process
+
+make -n libcvd.a | grep g++ | grep  /fast/ | awk '{print $(NF-2)}' | process 
fast
+make -n libcvd.a | grep g++ | grep  i686   | awk '{print $(NF-2)}' | process 
i686
+make -n libcvd.a | grep g++ | grep  noarch | awk '{print $(NF-2)}' | process 
noarch
+make -n libcvd.a | grep g++ | grep  pnm_src | awk '{print $(NF-2)}' | process 
pnm_src
+make -n libcvd.a | grep g++ | grep  Win32 | awk '{print $(NF-2)}' | process 
Win32
+make -n libcvd.a | grep g++ | grep  Linux | awk '{print $(NF-2)}' | process 
Linux
+make -n libcvd.a | grep g++ | grep  OSX | awk '{print $(NF-2)}' | process OSX
+make -n libcvd.a | grep g++ | grep  SSE | awk '{print $(NF-2)}' | process SSE
+
+
+cat << FOO
+               </Filter>
+FOO
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]