summaryrefslogtreecommitdiffstats
path: root/scilab/modules/differential_equations
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/differential_equations
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/differential_equations')
-rw-r--r--scilab/modules/differential_equations/Makefile.in4
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.vcproj4
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index a15064e..717b164 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -205,6 +205,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
205AWK = @AWK@ 205AWK = @AWK@
206BATIK = @BATIK@ 206BATIK = @BATIK@
207BLAS_LIBS = @BLAS_LIBS@ 207BLAS_LIBS = @BLAS_LIBS@
208BSH = @BSH@
208CC = @CC@ 209CC = @CC@
209CCDEPMODE = @CCDEPMODE@ 210CCDEPMODE = @CCDEPMODE@
210CFLAGS = @CFLAGS@ 211CFLAGS = @CFLAGS@
@@ -278,6 +279,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
278JOGL = @JOGL@ 279JOGL = @JOGL@
279JROSETTA_API = @JROSETTA_API@ 280JROSETTA_API = @JROSETTA_API@
280JROSETTA_ENGINE = @JROSETTA_ENGINE@ 281JROSETTA_ENGINE = @JROSETTA_ENGINE@
282JUNIT = @JUNIT@
281LAPACK_LIBS = @LAPACK_LIBS@ 283LAPACK_LIBS = @LAPACK_LIBS@
282LD = @LD@ 284LD = @LD@
283LDFLAGS = @LDFLAGS@ 285LDFLAGS = @LDFLAGS@
@@ -334,6 +336,7 @@ PVM_ENABLE = @PVM_ENABLE@
334PVM_INCLUDE = @PVM_INCLUDE@ 336PVM_INCLUDE = @PVM_INCLUDE@
335PVM_LIB = @PVM_LIB@ 337PVM_LIB = @PVM_LIB@
336PYTHON = @PYTHON@ 338PYTHON = @PYTHON@
339QDOX = @QDOX@
337RANLIB = @RANLIB@ 340RANLIB = @RANLIB@
338RELOCATABLE = @RELOCATABLE@ 341RELOCATABLE = @RELOCATABLE@
339RT_LIB = @RT_LIB@ 342RT_LIB = @RT_LIB@
@@ -352,6 +355,7 @@ SWIG_JAVA = @SWIG_JAVA@
352SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 355SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
353TCLTK_LIBS = @TCLTK_LIBS@ 356TCLTK_LIBS = @TCLTK_LIBS@
354TCL_INC_PATH = @TCL_INC_PATH@ 357TCL_INC_PATH = @TCL_INC_PATH@
358TESTNG = @TESTNG@
355TK_INC_PATH = @TK_INC_PATH@ 359TK_INC_PATH = @TK_INC_PATH@
356UMFPACK_ENABLE = @UMFPACK_ENABLE@ 360UMFPACK_ENABLE = @UMFPACK_ENABLE@
357UMFPACK_LIB = @UMFPACK_LIB@ 361UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/differential_equations/src/c/differential_equations.vcproj b/scilab/modules/differential_equations/src/c/differential_equations.vcproj
index d6f614d..897de8a 100644
--- a/scilab/modules/differential_equations/src/c/differential_equations.vcproj
+++ b/scilab/modules/differential_equations/src/c/differential_equations.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;../../../dynamic_link/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/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/differential_equations/src/fortran/differential_equations_f.vfproj b/scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj
index dc4cb01..3d1c50b 100644
--- a/scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj
+++ b/scilab/modules/differential_equations/src/fortran/differential_equations_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/differential_equations_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/differential_equations_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/differential_equations_f.lib"/> 25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/differential_equations_f.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>