Index: tol/win-VC8/tollib.vcproj
===================================================================
--- tol/win-VC8/tollib.vcproj	(revision 6d08d59176f26c3fe85fda2dcf53c8c50880b69f)
+++ tol/win-VC8/tollib.vcproj	(revision bcbfd231268c03a676552cdb1bae82ea34a874c3)
@@ -50,6 +50,6 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..;../..;"$(BOOST)";"$(LTDL_INC)";"$(BZIP2_INC)";"$(ATLAS_INC)";"$(CHOLMOD_INC)";"$(ANN_INCLUDE)";"$(GSL_INC)";"$(ZipArchive_INC)";"$(GOOGLE_SPARSEHASH)";../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois;../PackArchive"
-				PreprocessorDefinitions="_DEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__,__USE_ZIP_ARCHIVE__"
+				AdditionalIncludeDirectories=".;..;../..;"$(BOOST)";"$(BZIP2_INC)";"$(ATLAS_INC)";"$(CHOLMOD_INC)";"$(ANN_INCLUDE)";"$(GSL_INC)";"$(ZipArchive_INC)";"$(LTDL_INC)";"$(GOOGLE_SPARSEHASH)";"$(CINT_INC)";../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois;../PackArchive"
+				PreprocessorDefinitions="_DEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -79,9 +79,9 @@
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib ws2_32.lib shell32.lib libltdl.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/debug/libgsl_dll_d.lib $(CHOLMOD_LIB)/debug/libcholmod.lib $(CHOLMOD_LIB)/debug/blapi.lib $(BZIP2_LIB)/debug/libbz2_debug.lib $(ZipArchive_LIB)/debug/ZipArchive.lib ANN.lib $(NOINHERIT)"
+				AdditionalDependencies="user32.lib ws2_32.lib shell32.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/debug/libgsl_dll_d.lib $(CHOLMOD_LIB)/debug/libcholmod.lib $(CHOLMOD_LIB)/debug/blapi.lib $(BZIP2_LIB)/debug/libbz2_debug.lib $(ZipArchive_LIB)/debug/ZipArchive.lib $(CINT_LIB)/libcint.lib ANN.lib libltdl.lib $(NOINHERIT)"
 				OutputFile="Debug/tol.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(LTDL_LIB)&quot;;&quot;$(ATLAS_LIB)&quot;;&quot;$(GSL_LIB)&quot;;&quot;$(CHOLMOD_LIB)&quot;;&quot;$(BZIP2_LIB)&quot;;&quot;$(ANN_LIB)&quot;;&quot;$(ZipArchive_LIB)&quot;"
+				AdditionalLibraryDirectories="&quot;$(ATLAS_LIB)&quot;;&quot;$(GSL_LIB)&quot;;&quot;$(CHOLMOD_LIB)&quot;;&quot;$(BZIP2_LIB)&quot;;&quot;$(ANN_LIB)&quot;;&quot;$(ZipArchive_LIB)&quot;;&quot;$(LTDL_LIB)&quot;"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=".\Debug/tol.pdb"
@@ -155,6 +155,6 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories=".;..;../..;&quot;$(LTDL_INC)&quot;;&quot;$(BOOST)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(ANN_INCLUDE)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois;../PackArchive"
-				PreprocessorDefinitions="NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__,__USE_ZIP_ARCHIVE__"
+				AdditionalIncludeDirectories=".;..;../..;&quot;$(BOOST)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(ANN_INCLUDE)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(LTDL_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;&quot;$(CINT_INC)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois;../PackArchive"
+				PreprocessorDefinitions="NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -183,9 +183,9 @@
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="user32.lib shell32.lib ws2_32.lib libltdl.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/release/libgsl_dll.lib $(CHOLMOD_LIB)/release/libcholmod.lib $(CHOLMOD_LIB)/release/blapi.lib $(BZIP2_LIB)/release/libbz2.lib $(ZipArchive_LIB)/release/ZipArchive.lib ANN.lib $(NOINHERIT)"
+				AdditionalDependencies="user32.lib shell32.lib ws2_32.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/release/libgsl_dll.lib $(CHOLMOD_LIB)/release/libcholmod.lib $(CHOLMOD_LIB)/release/blapi.lib $(BZIP2_LIB)/release/libbz2.lib $(ZipArchive_LIB)/release/ZipArchive.lib $(CINT_LIB)/libcint.lib ANN.lib libltdl.lib $(NOINHERIT)"
 				OutputFile="$(OutDir)\tol.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="&quot;$(LTDL_LIB)&quot;;&quot;$(ATLAS_LIB)&quot;;&quot;$(GSL_LIB)&quot;;&quot;$(CHOLMOD_LIB)&quot;;&quot;$(BZIP2_LIB)&quot;;&quot;$(ANN_LIB)&quot;;&quot;$(ZipArchive_LIB)&quot;"
+				AdditionalLibraryDirectories="&quot;$(ATLAS_LIB)&quot;;&quot;$(GSL_LIB)&quot;;&quot;$(CHOLMOD_LIB)&quot;;&quot;$(BZIP2_LIB)&quot;;&quot;$(ANN_LIB)&quot;;&quot;$(ZipArchive_LIB)&quot;;&quot;$(LTDL_LIB)&quot;"
 				IgnoreAllDefaultLibraries="false"
 				IgnoreDefaultLibraryNames=""
@@ -262,5 +262,5 @@
 				WholeProgramOptimization="false"
 				AdditionalIncludeDirectories=".;..;../..;&quot;$(BOOST)&quot;;&quot;$(BZIP2_INC)&quot;;&quot;$(ATLAS_INC)&quot;;&quot;$(CHOLMOD_INC)&quot;;&quot;$(GSL_INC)&quot;;&quot;$(ZipArchive_INC)&quot;;&quot;$(GOOGLE_SPARSEHASH)&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bparser;../btol;../btol/bdb;../btol/bgrammar;../btol/bgsl;../btol/bmodel;../btol/code_type;../btol/complex_type;../btol/date_type;../btol/ctime_type;../btol/matrix_type;../btol/vmatrix_type;../btol/polynomial_type;../btol/ratio_type;../btol/real_type;../btol/serie_type;../btol/set_type;../btol/text_type;../btol/timeset_type;../btol/ctimeset_type;../btol/cseries_type;../lang;../ois"
-				PreprocessorDefinitions="NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
+				PreprocessorDefinitions="NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__"
 				StringPooling="true"
 				RuntimeLibrary="0"
@@ -4744,4 +4744,12 @@
 					<File
 						RelativePath="..\contrib\excel\tolExcel.cpp"
+						>
+					</File>
+				</Filter>
+				<Filter
+					Name="cint"
+					>
+					<File
+						RelativePath="..\contrib\cint\tolCint.cpp"
 						>
 					</File>