summaryrefslogtreecommitdiffstats
path: root/scilab/modules/special_functions
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/special_functions
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/special_functions')
-rw-r--r--scilab/modules/special_functions/Makefile.in4
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcproj4
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.vfproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 9ef81fc..c214628 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -181,6 +181,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
181AWK = @AWK@ 181AWK = @AWK@
182BATIK = @BATIK@ 182BATIK = @BATIK@
183BLAS_LIBS = @BLAS_LIBS@ 183BLAS_LIBS = @BLAS_LIBS@
184BSH = @BSH@
184CC = @CC@ 185CC = @CC@
185CCDEPMODE = @CCDEPMODE@ 186CCDEPMODE = @CCDEPMODE@
186CFLAGS = @CFLAGS@ 187CFLAGS = @CFLAGS@
@@ -254,6 +255,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
254JOGL = @JOGL@ 255JOGL = @JOGL@
255JROSETTA_API = @JROSETTA_API@ 256JROSETTA_API = @JROSETTA_API@
256JROSETTA_ENGINE = @JROSETTA_ENGINE@ 257JROSETTA_ENGINE = @JROSETTA_ENGINE@
258JUNIT = @JUNIT@
257LAPACK_LIBS = @LAPACK_LIBS@ 259LAPACK_LIBS = @LAPACK_LIBS@
258LD = @LD@ 260LD = @LD@
259LDFLAGS = @LDFLAGS@ 261LDFLAGS = @LDFLAGS@
@@ -310,6 +312,7 @@ PVM_ENABLE = @PVM_ENABLE@
310PVM_INCLUDE = @PVM_INCLUDE@ 312PVM_INCLUDE = @PVM_INCLUDE@
311PVM_LIB = @PVM_LIB@ 313PVM_LIB = @PVM_LIB@
312PYTHON = @PYTHON@ 314PYTHON = @PYTHON@
315QDOX = @QDOX@
313RANLIB = @RANLIB@ 316RANLIB = @RANLIB@
314RELOCATABLE = @RELOCATABLE@ 317RELOCATABLE = @RELOCATABLE@
315RT_LIB = @RT_LIB@ 318RT_LIB = @RT_LIB@
@@ -328,6 +331,7 @@ SWIG_JAVA = @SWIG_JAVA@
328SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 331SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
329TCLTK_LIBS = @TCLTK_LIBS@ 332TCLTK_LIBS = @TCLTK_LIBS@
330TCL_INC_PATH = @TCL_INC_PATH@ 333TCL_INC_PATH = @TCL_INC_PATH@
334TESTNG = @TESTNG@
331TK_INC_PATH = @TK_INC_PATH@ 335TK_INC_PATH = @TK_INC_PATH@
332UMFPACK_ENABLE = @UMFPACK_ENABLE@ 336UMFPACK_ENABLE = @UMFPACK_ENABLE@
333UMFPACK_LIB = @UMFPACK_LIB@ 337UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/special_functions/src/c/special_functions.vcproj b/scilab/modules/special_functions/src/c/special_functions.vcproj
index 5804a53..e1f95df 100644
--- a/scilab/modules/special_functions/src/c/special_functions.vcproj
+++ b/scilab/modules/special_functions/src/c/special_functions.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;../../../core/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
@@ -195,7 +195,7 @@
195 /> 195 />
196 <Tool 196 <Tool
197 Name="VCCLCompilerTool" 197 Name="VCCLCompilerTool"
198 AdditionalOptions="/arch:IA32" 198 AdditionalOptions=""
199 Optimization="2" 199 Optimization="2"
200 InlineFunctionExpansion="1" 200 InlineFunctionExpansion="1"
201 FavorSizeOrSpeed="1" 201 FavorSizeOrSpeed="1"
diff --git a/scilab/modules/special_functions/src/fortran/special_functions_f.vfproj b/scilab/modules/special_functions/src/fortran/special_functions_f.vfproj
index ea99556..3a141a0 100644
--- a/scilab/modules/special_functions/src/fortran/special_functions_f.vfproj
+++ b/scilab/modules/special_functions/src/fortran/special_functions_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;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
8 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" 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="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/special_functions_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/special_functions_f.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
@@ -20,7 +20,7 @@ del *.def &gt;nul
20cd .."/> 20cd .."/>
21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
22 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 22 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
23 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 23 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/special_functions_f.lib"/> 25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/special_functions_f.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>