summaryrefslogtreecommitdiffstats
path: root/scilab/modules/sound
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/sound
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/sound')
-rw-r--r--scilab/modules/sound/Makefile.in4
-rw-r--r--scilab/modules/sound/sound.vcproj4
-rw-r--r--scilab/modules/sound/src/nosound/nosound.vcproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index 0a1aa73..8052fe4 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -151,6 +151,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
151AWK = @AWK@ 151AWK = @AWK@
152BATIK = @BATIK@ 152BATIK = @BATIK@
153BLAS_LIBS = @BLAS_LIBS@ 153BLAS_LIBS = @BLAS_LIBS@
154BSH = @BSH@
154CC = @CC@ 155CC = @CC@
155CCDEPMODE = @CCDEPMODE@ 156CCDEPMODE = @CCDEPMODE@
156CFLAGS = @CFLAGS@ 157CFLAGS = @CFLAGS@
@@ -224,6 +225,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
224JOGL = @JOGL@ 225JOGL = @JOGL@
225JROSETTA_API = @JROSETTA_API@ 226JROSETTA_API = @JROSETTA_API@
226JROSETTA_ENGINE = @JROSETTA_ENGINE@ 227JROSETTA_ENGINE = @JROSETTA_ENGINE@
228JUNIT = @JUNIT@
227LAPACK_LIBS = @LAPACK_LIBS@ 229LAPACK_LIBS = @LAPACK_LIBS@
228LD = @LD@ 230LD = @LD@
229LDFLAGS = @LDFLAGS@ 231LDFLAGS = @LDFLAGS@
@@ -280,6 +282,7 @@ PVM_ENABLE = @PVM_ENABLE@
280PVM_INCLUDE = @PVM_INCLUDE@ 282PVM_INCLUDE = @PVM_INCLUDE@
281PVM_LIB = @PVM_LIB@ 283PVM_LIB = @PVM_LIB@
282PYTHON = @PYTHON@ 284PYTHON = @PYTHON@
285QDOX = @QDOX@
283RANLIB = @RANLIB@ 286RANLIB = @RANLIB@
284RELOCATABLE = @RELOCATABLE@ 287RELOCATABLE = @RELOCATABLE@
285RT_LIB = @RT_LIB@ 288RT_LIB = @RT_LIB@
@@ -298,6 +301,7 @@ SWIG_JAVA = @SWIG_JAVA@
298SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 301SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
299TCLTK_LIBS = @TCLTK_LIBS@ 302TCLTK_LIBS = @TCLTK_LIBS@
300TCL_INC_PATH = @TCL_INC_PATH@ 303TCL_INC_PATH = @TCL_INC_PATH@
304TESTNG = @TESTNG@
301TK_INC_PATH = @TK_INC_PATH@ 305TK_INC_PATH = @TK_INC_PATH@
302UMFPACK_ENABLE = @UMFPACK_ENABLE@ 306UMFPACK_ENABLE = @UMFPACK_ENABLE@
303UMFPACK_LIB = @UMFPACK_LIB@ 307UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/sound/sound.vcproj b/scilab/modules/sound/sound.vcproj
index 8b942c7..e6e3362 100644
--- a/scilab/modules/sound/sound.vcproj
+++ b/scilab/modules/sound/sound.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;src/c;../core/includes;../fileio/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes" 48 AdditionalIncludeDirectories="includes;src/c;../core/includes;../fileio/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../api_scilab/includes"
49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
@@ -208,7 +208,7 @@
208 /> 208 />
209 <Tool 209 <Tool
210 Name="VCCLCompilerTool" 210 Name="VCCLCompilerTool"
211 AdditionalOptions="/arch:IA32" 211 AdditionalOptions=""
212 InlineFunctionExpansion="1" 212 InlineFunctionExpansion="1"
213 FavorSizeOrSpeed="1" 213 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false" 214 WholeProgramOptimization="false"
diff --git a/scilab/modules/sound/src/nosound/nosound.vcproj b/scilab/modules/sound/src/nosound/nosound.vcproj
index 2a12f7d..9ab3d1f 100644
--- a/scilab/modules/sound/src/nosound/nosound.vcproj
+++ b/scilab/modules/sound/src/nosound/nosound.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="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes;../../includes" 48 AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../api_scilab/includes;../../includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS"
@@ -208,7 +208,7 @@
208 /> 208 />
209 <Tool 209 <Tool
210 Name="VCCLCompilerTool" 210 Name="VCCLCompilerTool"
211 AdditionalOptions="/arch:IA32" 211 AdditionalOptions=""
212 InlineFunctionExpansion="1" 212 InlineFunctionExpansion="1"
213 FavorSizeOrSpeed="1" 213 FavorSizeOrSpeed="1"
214 WholeProgramOptimization="false" 214 WholeProgramOptimization="false"