summaryrefslogtreecommitdiffstats
path: root/scilab/modules/symbolic
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/symbolic
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/symbolic')
-rw-r--r--scilab/modules/symbolic/Makefile.in4
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.vcproj4
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.vfproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index 23eba38..44382c9 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -166,6 +166,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
166AWK = @AWK@ 166AWK = @AWK@
167BATIK = @BATIK@ 167BATIK = @BATIK@
168BLAS_LIBS = @BLAS_LIBS@ 168BLAS_LIBS = @BLAS_LIBS@
169BSH = @BSH@
169CC = @CC@ 170CC = @CC@
170CCDEPMODE = @CCDEPMODE@ 171CCDEPMODE = @CCDEPMODE@
171CFLAGS = @CFLAGS@ 172CFLAGS = @CFLAGS@
@@ -239,6 +240,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
239JOGL = @JOGL@ 240JOGL = @JOGL@
240JROSETTA_API = @JROSETTA_API@ 241JROSETTA_API = @JROSETTA_API@
241JROSETTA_ENGINE = @JROSETTA_ENGINE@ 242JROSETTA_ENGINE = @JROSETTA_ENGINE@
243JUNIT = @JUNIT@
242LAPACK_LIBS = @LAPACK_LIBS@ 244LAPACK_LIBS = @LAPACK_LIBS@
243LD = @LD@ 245LD = @LD@
244LDFLAGS = @LDFLAGS@ 246LDFLAGS = @LDFLAGS@
@@ -295,6 +297,7 @@ PVM_ENABLE = @PVM_ENABLE@
295PVM_INCLUDE = @PVM_INCLUDE@ 297PVM_INCLUDE = @PVM_INCLUDE@
296PVM_LIB = @PVM_LIB@ 298PVM_LIB = @PVM_LIB@
297PYTHON = @PYTHON@ 299PYTHON = @PYTHON@
300QDOX = @QDOX@
298RANLIB = @RANLIB@ 301RANLIB = @RANLIB@
299RELOCATABLE = @RELOCATABLE@ 302RELOCATABLE = @RELOCATABLE@
300RT_LIB = @RT_LIB@ 303RT_LIB = @RT_LIB@
@@ -313,6 +316,7 @@ SWIG_JAVA = @SWIG_JAVA@
313SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 316SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
314TCLTK_LIBS = @TCLTK_LIBS@ 317TCLTK_LIBS = @TCLTK_LIBS@
315TCL_INC_PATH = @TCL_INC_PATH@ 318TCL_INC_PATH = @TCL_INC_PATH@
319TESTNG = @TESTNG@
316TK_INC_PATH = @TK_INC_PATH@ 320TK_INC_PATH = @TK_INC_PATH@
317UMFPACK_ENABLE = @UMFPACK_ENABLE@ 321UMFPACK_ENABLE = @UMFPACK_ENABLE@
318UMFPACK_LIB = @UMFPACK_LIB@ 322UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/symbolic/src/c/symbolic.vcproj b/scilab/modules/symbolic/src/c/symbolic.vcproj
index 96b988c..8d7a074 100644
--- a/scilab/modules/symbolic/src/c/symbolic.vcproj
+++ b/scilab/modules/symbolic/src/c/symbolic.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;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/hashtable;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SYMBOLIC_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SYMBOLIC_EXPORTS"
@@ -210,7 +210,7 @@
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCCLCompilerTool" 212 Name="VCCLCompilerTool"
213 AdditionalOptions="/arch:IA32" 213 AdditionalOptions=""
214 InlineFunctionExpansion="1" 214 InlineFunctionExpansion="1"
215 FavorSizeOrSpeed="1" 215 FavorSizeOrSpeed="1"
216 WholeProgramOptimization="false" 216 WholeProgramOptimization="false"
diff --git a/scilab/modules/symbolic/src/fortran/symbolic_f.vfproj b/scilab/modules/symbolic/src/fortran/symbolic_f.vfproj
index d17c718..099fe15 100644
--- a/scilab/modules/symbolic/src/fortran/symbolic_f.vfproj
+++ b/scilab/modules/symbolic/src/fortran/symbolic_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\symbolic_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="symbolic_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\symbolic_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\symbolic_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="symbolic_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\symbolic_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"/>
@@ -21,7 +21,7 @@ copy symbolic_f_header.def+symbolic_f.vcdef symbolic_f.def &gt;nul" Description=
21 <Tool Name="VFPostBuildEventTool"/> 21 <Tool Name="VFPostBuildEventTool"/>
22 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 22 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
24 <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"/> 24 <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"/>
25 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\symbolic_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="symbolic_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\symbolic_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/> 25 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\symbolic_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="symbolic_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\symbolic_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>
27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>