Changeset 23f6548 in tol

Timestamp:

May 8, 2012, 5:17:02 PM (14 years ago)

Author:

Víctor de Buen <vdebuen@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

9062e36

Parents:

d9476e7

Message:

Supporting arbitrary precision arithmetic with MPFR

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4652 be4846ae-f051-483a-831f-b64e7d08527f

File:

• tol/win-VC9/tollib.vcproj (modified) (5 diffs)

tol/win-VC9/tollib.vcproj

@@ -51 +51 @@
                                 Name="VCCLCompilerTool"
                                 Optimization="0"
-                                AdditionalIncludeDirectories=".;..;../..;"$(BOOST)";"$(BZIP2_INC)";"$(ATLAS_INC)";"$(ANN_INCLUDE)";"$(CHOLMOD_INC)";"$(GSL_INC)";"$(ZipArchive_INC)";"$(LTDL_INC)";"$(GOOGLE_SPARSEHASH)";"$(CINT_INC)";"$(GSL_INC)/../../fftw";../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bmath/fftw;../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;"$(ZipArchive_INC)/zlib""
+                                AdditionalIncludeDirectories=".;..;../..;"$(BOOST)";"$(BZIP2_INC)";"$(ATLAS_INC)";"$(ANN_INCLUDE)";"$(CHOLMOD_INC)";"$(GSL_INC)";"$(ZipArchive_INC)";"$(LTDL_INC)";"$(GOOGLE_SPARSEHASH)";"$(CINT_INC)";"$(GSL_INC)/../../fftw";"$(GSL_INC)/../../mpir/dll/Win32/Debug";"$(GSL_INC)/../../mpfr";../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bmath/fftw;../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;"$(ZipArchive_INC)/zlib""
                                 PreprocessorDefinitions="_DEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
                                 MinimalRebuild="true"
@@ -80 +80 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="user32.lib ws2_32.lib shell32.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/debug/libgsl_dll_d.lib $(GSL_LIB)/../../fftw/libfftw3-3.lib $(CHOLMOD_LIB)/debug/libcholmod.lib $(CHOLMOD_LIB)/debug/blapi.lib $(BZIP2_LIB)/debug/libbz2_debug.lib $(ZipArchive_LIB)/debug/ZipArchive.lib ANN.lib libltdl.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 $(GSL_LIB)/../../fftw/libfftw3-3.lib $(GSL_LIB)/../../mpfr/dll/Win32/Debug/mpfr.lib $(GSL_LIB)/../../mpir/dll/Win32/Debug/mpir.lib $(CHOLMOD_LIB)/debug/libcholmod.lib $(CHOLMOD_LIB)/debug/blapi.lib $(BZIP2_LIB)/debug/libbz2_debug.lib $(ZipArchive_LIB)/debug/ZipArchive.lib ANN.lib libltdl.lib $(NOINHERIT)"
                                 OutputFile="Debug/tol.dll"
                                 LinkIncremental="2"
@@ -155 +155 @@
                                 FavorSizeOrSpeed="1"
                                 WholeProgramOptimization="false"
-                                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;;&quot;$(GSL_INC)/../../fftw&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bmath/fftw;../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;&quot;$(ZipArchive_INC)/zlib&quot;"
+                                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;;&quot;$(GSL_INC)/../../fftw&quot;;&quot;$(GSL_INC)/../../mpir/dll/Win32/Release&quot;;&quot;$(GSL_INC)/../../mpfr&quot;;../bbasic;../bmath;../bmath/barith;../bmath/bfunct;../bmath/blinalg;../bmath/bprdist;../bmath/bstat;../bmath/csparse;../bmath/dcdflib;../bmath/mathobjects;../bmath/gsl_ext;../bmath/fftw;../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;&quot;$(ZipArchive_INC)/zlib&quot;"
                                 PreprocessorDefinitions="NDEBUG;__WIN32__;WIN32;_WINDOWS;_USRDLL;HAVE_CONFIG_H;TOLDLL_EXPORTS;__USE_DYNSCOPE__;__USE_ZIP_ARCHIVE__"
                                 StringPooling="true"
@@ -183 +183 @@
                         <Tool
                                 Name="VCLinkerTool"
-                                AdditionalDependencies="user32.lib shell32.lib ws2_32.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/release/libgsl_dll.lib $(GSL_LIB)/../../fftw/libfftw3-3.lib $(CHOLMOD_LIB)/release/libcholmod.lib $(CHOLMOD_LIB)/release/blapi.lib $(BZIP2_LIB)/release/libbz2.lib $(ZipArchive_LIB)/release/ZipArchive.lib ANN.lib libltdl.lib $(NOINHERIT)"
+                                AdditionalDependencies="user32.lib shell32.lib ws2_32.lib $(ATLAS_LIB)/libcblas.lib $(ATLAS_LIB)/libclapack.lib $(GSL_LIB)/release/libgsl_dll.lib $(GSL_LIB)/../../fftw/libfftw3-3.lib $(GSL_LIB)/../../mpfr/dll/Win32/Release/mpfr.lib $(GSL_LIB)/../../mpir/dll/Win32/Release/mpir.lib $(CHOLMOD_LIB)/release/libcholmod.lib $(CHOLMOD_LIB)/release/blapi.lib $(BZIP2_LIB)/release/libbz2.lib $(ZipArchive_LIB)/release/ZipArchive.lib ANN.lib libltdl.lib $(NOINHERIT)"
                                 OutputFile="$(OutDir)\tol.dll"
                                 LinkIncremental="1"
@@ -2042 +2042 @@
                                                         />
                                                 </FileConfiguration>
+                                        </File>
+                                        <File
+                                                RelativePath="..\bmath\mathobjects\dlmalloc.c"
+                                                >
+                                        </File>
+                                        <File
+                                                RelativePath="..\bmath\mathobjects\mpreal.cpp"
+                                                >
                                         </File>
                                 </Filter>