summaryrefslogtreecommitdiffstats
path: root/scilab/modules/signal_processing
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/signal_processing
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/signal_processing')
-rw-r--r--scilab/modules/signal_processing/Makefile.in4
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.vcproj4
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 74fa764..9f66220 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -186,6 +186,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
186AWK = @AWK@ 186AWK = @AWK@
187BATIK = @BATIK@ 187BATIK = @BATIK@
188BLAS_LIBS = @BLAS_LIBS@ 188BLAS_LIBS = @BLAS_LIBS@
189BSH = @BSH@
189CC = @CC@ 190CC = @CC@
190CCDEPMODE = @CCDEPMODE@ 191CCDEPMODE = @CCDEPMODE@
191CFLAGS = @CFLAGS@ 192CFLAGS = @CFLAGS@
@@ -259,6 +260,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
259JOGL = @JOGL@ 260JOGL = @JOGL@
260JROSETTA_API = @JROSETTA_API@ 261JROSETTA_API = @JROSETTA_API@
261JROSETTA_ENGINE = @JROSETTA_ENGINE@ 262JROSETTA_ENGINE = @JROSETTA_ENGINE@
263JUNIT = @JUNIT@
262LAPACK_LIBS = @LAPACK_LIBS@ 264LAPACK_LIBS = @LAPACK_LIBS@
263LD = @LD@ 265LD = @LD@
264LDFLAGS = @LDFLAGS@ 266LDFLAGS = @LDFLAGS@
@@ -315,6 +317,7 @@ PVM_ENABLE = @PVM_ENABLE@
315PVM_INCLUDE = @PVM_INCLUDE@ 317PVM_INCLUDE = @PVM_INCLUDE@
316PVM_LIB = @PVM_LIB@ 318PVM_LIB = @PVM_LIB@
317PYTHON = @PYTHON@ 319PYTHON = @PYTHON@
320QDOX = @QDOX@
318RANLIB = @RANLIB@ 321RANLIB = @RANLIB@
319RELOCATABLE = @RELOCATABLE@ 322RELOCATABLE = @RELOCATABLE@
320RT_LIB = @RT_LIB@ 323RT_LIB = @RT_LIB@
@@ -333,6 +336,7 @@ SWIG_JAVA = @SWIG_JAVA@
333SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 336SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
334TCLTK_LIBS = @TCLTK_LIBS@ 337TCLTK_LIBS = @TCLTK_LIBS@
335TCL_INC_PATH = @TCL_INC_PATH@ 338TCL_INC_PATH = @TCL_INC_PATH@
339TESTNG = @TESTNG@
336TK_INC_PATH = @TK_INC_PATH@ 340TK_INC_PATH = @TK_INC_PATH@
337UMFPACK_ENABLE = @UMFPACK_ENABLE@ 341UMFPACK_ENABLE = @UMFPACK_ENABLE@
338UMFPACK_LIB = @UMFPACK_LIB@ 342UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/signal_processing/src/c/signal_processing.vcproj b/scilab/modules/signal_processing/src/c/signal_processing.vcproj
index 6f33133..4195918 100644
--- a/scilab/modules/signal_processing/src/c/signal_processing.vcproj
+++ b/scilab/modules/signal_processing/src/c/signal_processing.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;../../../dynamic_link/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes" 48 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../dynamic_link/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SIGNAL_PROCESSING_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SIGNAL_PROCESSING_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/signal_processing/src/fortran/signal_processing_f.vfproj b/scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
index 11604c4..590cfc5 100644
--- a/scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj
+++ b/scilab/modules/signal_processing/src/fortran/signal_processing_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\signal_processing_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="signal_processing_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\signal_processing_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib signal_processing.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\signal_processing_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="signal_processing_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\signal_processing_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib signal_processing.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"/>
@@ -23,7 +23,7 @@ lib /DEF:&quot;$(InputDir)output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MAC
23 <Tool Name="VFPostBuildEventTool"/> 23 <Tool Name="VFPostBuildEventTool"/>
24 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 24 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
25 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 25 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
26 <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"/> 26 <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"/>
27 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\signal_processing_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="signal_processing_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\signal_processing_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib signal_processing.lib"/> 27 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\signal_processing_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="signal_processing_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\signal_processing_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib signal_processing.lib"/>
28 <Tool Name="VFResourceCompilerTool"/> 28 <Tool Name="VFResourceCompilerTool"/>
29 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 29 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>