summaryrefslogtreecommitdiffstats
path: root/scilab/modules/mexlib
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/mexlib
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/mexlib')
-rw-r--r--scilab/modules/mexlib/Makefile.in4
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.vcproj4
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.vcproj4
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.vcproj4
4 files changed, 10 insertions, 6 deletions
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index 89a178b..7c75ed1 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -164,6 +164,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
164AWK = @AWK@ 164AWK = @AWK@
165BATIK = @BATIK@ 165BATIK = @BATIK@
166BLAS_LIBS = @BLAS_LIBS@ 166BLAS_LIBS = @BLAS_LIBS@
167BSH = @BSH@
167CC = @CC@ 168CC = @CC@
168CCDEPMODE = @CCDEPMODE@ 169CCDEPMODE = @CCDEPMODE@
169CFLAGS = @CFLAGS@ 170CFLAGS = @CFLAGS@
@@ -237,6 +238,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
237JOGL = @JOGL@ 238JOGL = @JOGL@
238JROSETTA_API = @JROSETTA_API@ 239JROSETTA_API = @JROSETTA_API@
239JROSETTA_ENGINE = @JROSETTA_ENGINE@ 240JROSETTA_ENGINE = @JROSETTA_ENGINE@
241JUNIT = @JUNIT@
240LAPACK_LIBS = @LAPACK_LIBS@ 242LAPACK_LIBS = @LAPACK_LIBS@
241LD = @LD@ 243LD = @LD@
242LDFLAGS = @LDFLAGS@ 244LDFLAGS = @LDFLAGS@
@@ -293,6 +295,7 @@ PVM_ENABLE = @PVM_ENABLE@
293PVM_INCLUDE = @PVM_INCLUDE@ 295PVM_INCLUDE = @PVM_INCLUDE@
294PVM_LIB = @PVM_LIB@ 296PVM_LIB = @PVM_LIB@
295PYTHON = @PYTHON@ 297PYTHON = @PYTHON@
298QDOX = @QDOX@
296RANLIB = @RANLIB@ 299RANLIB = @RANLIB@
297RELOCATABLE = @RELOCATABLE@ 300RELOCATABLE = @RELOCATABLE@
298RT_LIB = @RT_LIB@ 301RT_LIB = @RT_LIB@
@@ -311,6 +314,7 @@ SWIG_JAVA = @SWIG_JAVA@
311SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 314SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
312TCLTK_LIBS = @TCLTK_LIBS@ 315TCLTK_LIBS = @TCLTK_LIBS@
313TCL_INC_PATH = @TCL_INC_PATH@ 316TCL_INC_PATH = @TCL_INC_PATH@
317TESTNG = @TESTNG@
314TK_INC_PATH = @TK_INC_PATH@ 318TK_INC_PATH = @TK_INC_PATH@
315UMFPACK_ENABLE = @UMFPACK_ENABLE@ 319UMFPACK_ENABLE = @UMFPACK_ENABLE@
316UMFPACK_LIB = @UMFPACK_LIB@ 320UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/mexlib/src/libmat/libmat.vcproj b/scilab/modules/mexlib/src/libmat/libmat.vcproj
index b4622a2..0a2dfb5 100644
--- a/scilab/modules/mexlib/src/libmat/libmat.vcproj
+++ b/scilab/modules/mexlib/src/libmat/libmat.vcproj
@@ -42,7 +42,7 @@
42 /> 42 />
43 <Tool 43 <Tool
44 Name="VCCLCompilerTool" 44 Name="VCCLCompilerTool"
45 AdditionalOptions="/arch:IA32" 45 AdditionalOptions=""
46 Optimization="0" 46 Optimization="0"
47 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 47 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
48 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE" 48 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
@@ -216,7 +216,7 @@
216 /> 216 />
217 <Tool 217 <Tool
218 Name="VCCLCompilerTool" 218 Name="VCCLCompilerTool"
219 AdditionalOptions="/arch:IA32" 219 AdditionalOptions=""
220 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 220 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
221 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE" 221 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
222 RuntimeLibrary="2" 222 RuntimeLibrary="2"
diff --git a/scilab/modules/mexlib/src/libmex/libmex.vcproj b/scilab/modules/mexlib/src/libmex/libmex.vcproj
index 9f9b6f0..906b207 100644
--- a/scilab/modules/mexlib/src/libmex/libmex.vcproj
+++ b/scilab/modules/mexlib/src/libmex/libmex.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;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 48 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
49 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
@@ -217,7 +217,7 @@
217 /> 217 />
218 <Tool 218 <Tool
219 Name="VCCLCompilerTool" 219 Name="VCCLCompilerTool"
220 AdditionalOptions="/arch:IA32" 220 AdditionalOptions=""
221 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 221 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
222 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE" 222 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
223 RuntimeLibrary="2" 223 RuntimeLibrary="2"
diff --git a/scilab/modules/mexlib/src/libmx/libmx.vcproj b/scilab/modules/mexlib/src/libmx/libmx.vcproj
index b26c6b0..ba37862 100644
--- a/scilab/modules/mexlib/src/libmx/libmx.vcproj
+++ b/scilab/modules/mexlib/src/libmx/libmx.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;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 48 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
49 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE" 49 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
@@ -217,7 +217,7 @@
217 /> 217 />
218 <Tool 218 <Tool
219 Name="VCCLCompilerTool" 219 Name="VCCLCompilerTool"
220 AdditionalOptions="/arch:IA32" 220 AdditionalOptions=""
221 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl" 221 AdditionalIncludeDirectories="../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../call_scilab/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
222 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE" 222 PreprocessorDefinitions="mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
223 RuntimeLibrary="2" 223 RuntimeLibrary="2"