summaryrefslogtreecommitdiffstats
path: root/scilab/modules/interpolation
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/interpolation
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/interpolation')
-rw-r--r--scilab/modules/interpolation/Makefile.in4
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.vcproj4
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.vfproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 0f390ae..15be04b 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -180,6 +180,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
180AWK = @AWK@ 180AWK = @AWK@
181BATIK = @BATIK@ 181BATIK = @BATIK@
182BLAS_LIBS = @BLAS_LIBS@ 182BLAS_LIBS = @BLAS_LIBS@
183BSH = @BSH@
183CC = @CC@ 184CC = @CC@
184CCDEPMODE = @CCDEPMODE@ 185CCDEPMODE = @CCDEPMODE@
185CFLAGS = @CFLAGS@ 186CFLAGS = @CFLAGS@
@@ -253,6 +254,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
253JOGL = @JOGL@ 254JOGL = @JOGL@
254JROSETTA_API = @JROSETTA_API@ 255JROSETTA_API = @JROSETTA_API@
255JROSETTA_ENGINE = @JROSETTA_ENGINE@ 256JROSETTA_ENGINE = @JROSETTA_ENGINE@
257JUNIT = @JUNIT@
256LAPACK_LIBS = @LAPACK_LIBS@ 258LAPACK_LIBS = @LAPACK_LIBS@
257LD = @LD@ 259LD = @LD@
258LDFLAGS = @LDFLAGS@ 260LDFLAGS = @LDFLAGS@
@@ -309,6 +311,7 @@ PVM_ENABLE = @PVM_ENABLE@
309PVM_INCLUDE = @PVM_INCLUDE@ 311PVM_INCLUDE = @PVM_INCLUDE@
310PVM_LIB = @PVM_LIB@ 312PVM_LIB = @PVM_LIB@
311PYTHON = @PYTHON@ 313PYTHON = @PYTHON@
314QDOX = @QDOX@
312RANLIB = @RANLIB@ 315RANLIB = @RANLIB@
313RELOCATABLE = @RELOCATABLE@ 316RELOCATABLE = @RELOCATABLE@
314RT_LIB = @RT_LIB@ 317RT_LIB = @RT_LIB@
@@ -327,6 +330,7 @@ SWIG_JAVA = @SWIG_JAVA@
327SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 330SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
328TCLTK_LIBS = @TCLTK_LIBS@ 331TCLTK_LIBS = @TCLTK_LIBS@
329TCL_INC_PATH = @TCL_INC_PATH@ 332TCL_INC_PATH = @TCL_INC_PATH@
333TESTNG = @TESTNG@
330TK_INC_PATH = @TK_INC_PATH@ 334TK_INC_PATH = @TK_INC_PATH@
331UMFPACK_ENABLE = @UMFPACK_ENABLE@ 335UMFPACK_ENABLE = @UMFPACK_ENABLE@
332UMFPACK_LIB = @UMFPACK_LIB@ 336UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/interpolation/src/c/interpolation.vcproj b/scilab/modules/interpolation/src/c/interpolation.vcproj
index b7f737d..3d8b96d 100644
--- a/scilab/modules/interpolation/src/c/interpolation.vcproj
+++ b/scilab/modules/interpolation/src/c/interpolation.vcproj
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS"
@@ -212,7 +212,7 @@
212 /> 212 />
213 <Tool 213 <Tool
214 Name="VCCLCompilerTool" 214 Name="VCCLCompilerTool"
215 AdditionalOptions="/arch:IA32" 215 AdditionalOptions=""
216 InlineFunctionExpansion="1" 216 InlineFunctionExpansion="1"
217 FavorSizeOrSpeed="1" 217 FavorSizeOrSpeed="1"
218 WholeProgramOptimization="false" 218 WholeProgramOptimization="false"
diff --git a/scilab/modules/interpolation/src/fortran/interpolation_f.vfproj b/scilab/modules/interpolation/src/fortran/interpolation_f.vfproj
index 1f8c248..90045d2 100644
--- a/scilab/modules/interpolation/src/fortran/interpolation_f.vfproj
+++ b/scilab/modules/interpolation/src/fortran/interpolation_f.vfproj
@@ -5,7 +5,7 @@
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\interpolation_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="interpolation_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\interpolation_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\interpolation_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="interpolation_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\interpolation_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -22,7 +22,7 @@ lib /DEF:&quot;$(InputDir)interpolation_Import.def&quot; /SUBSYSTEM:WINDOWS /MAC
22 <Tool Name="VFPostBuildEventTool"/> 22 <Tool Name="VFPostBuildEventTool"/>
23 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 23 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
24 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 24 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
25 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 25 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
26 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\interpolation_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="interpolation_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\interpolation_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/> 26 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\interpolation_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="interpolation_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\interpolation_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
27 <Tool Name="VFResourceCompilerTool"/> 27 <Tool Name="VFResourceCompilerTool"/>
28 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 28 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>