summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2009-03-04 15:22:11 +0100
committerAllan CORNET <allan.cornet@scilab.org>2009-03-04 15:22:11 +0100
commit389baf8f9e69b0bba29c64852b0b9233ca723861 (patch)
treede5d96a1a6affaaf6bed197f2532256c13c02b7e
parent767ad2ea688546171454b6a3a579eb287fe5d2d2 (diff)
downloadscilab-389baf8f9e69b0bba29c64852b0b9233ca723861.zip
scilab-389baf8f9e69b0bba29c64852b0b9233ca723861.tar.gz
Merge commit 'refs/remotes/origin/5.1' modules/core/src/c/core.vcproj
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in20
-rw-r--r--scilab/modules/call_scilab/etc/call_scilab.start4
-rw-r--r--scilab/modules/core/src/c/core.vcproj26
-rw-r--r--scilab/modules/javasci/Javasci.vcproj8
5 files changed, 34 insertions, 26 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index 4cc6fa4..7b7565e 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -50,6 +50,7 @@ intersci \
50metanet \ 50metanet \
51signal_processing \ 51signal_processing \
52core \ 52core \
53call_scilab \
53interpolation \ 54interpolation \
54sound \ 55sound \
55time \ 56time \
@@ -116,6 +117,7 @@ $(top_builddir)/modules/mexlib/libmex.la \
116 $(top_builddir)/modules/boolean/libsciboolean.la \ 117 $(top_builddir)/modules/boolean/libsciboolean.la \
117 $(top_builddir)/modules/cacsd/libscicacsd.la \ 118 $(top_builddir)/modules/cacsd/libscicacsd.la \
118 $(top_builddir)/modules/core/libscicore.la \ 119 $(top_builddir)/modules/core/libscicore.la \
120 $(top_builddir)/modules/call_scilab/libscicall_scilab.la \
119 $(top_builddir)/modules/data_structures/libscidata_structures.la \ 121 $(top_builddir)/modules/data_structures/libscidata_structures.la \
120 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ 122 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
121 $(top_builddir)/modules/double/libscidouble.la \ 123 $(top_builddir)/modules/double/libscidouble.la \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index cdfd4ae..00f294d 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -135,9 +135,9 @@ DIST_SUBDIRS = core output_stream action_binding arnoldi \
135 optimization symbolic randlib statistics special_functions \ 135 optimization symbolic randlib statistics special_functions \
136 interpolation linear_algebra integer data_structures mexlib \ 136 interpolation linear_algebra integer data_structures mexlib \
137 differential_equations cacsd polynomials boolean double pvm io \ 137 differential_equations cacsd polynomials boolean double pvm io \
138 intersci metanet signal_processing sound time sparse \ 138 intersci metanet signal_processing call_scilab sound time \
139 windows_tools functions overloading maple2scilab m2sci texmacs \ 139 sparse windows_tools functions overloading maple2scilab m2sci \
140 scipad scilab2fortran development_tools \ 140 texmacs scipad scilab2fortran development_tools \
141 compatibility_functions helptools fftw umfpack demo_tools \ 141 compatibility_functions helptools fftw umfpack demo_tools \
142 genetic_algorithms simulated_annealing parameters matio \ 142 genetic_algorithms simulated_annealing parameters matio \
143 scicos_blocks scicos . javasci 143 scicos_blocks scicos . javasci
@@ -345,12 +345,13 @@ SUBDIRS = core output_stream action_binding arnoldi \
345 optimization symbolic randlib statistics special_functions \ 345 optimization symbolic randlib statistics special_functions \
346 interpolation linear_algebra integer data_structures mexlib \ 346 interpolation linear_algebra integer data_structures mexlib \
347 differential_equations cacsd polynomials boolean double pvm io \ 347 differential_equations cacsd polynomials boolean double pvm io \
348 intersci metanet signal_processing core interpolation sound \ 348 intersci metanet signal_processing core call_scilab \
349 time randlib sparse windows_tools functions overloading \ 349 interpolation sound time randlib sparse windows_tools \
350 maple2scilab m2sci texmacs scipad scilab2fortran \ 350 functions overloading maple2scilab m2sci texmacs scipad \
351 development_tools compatibility_functions helptools fftw \ 351 scilab2fortran development_tools compatibility_functions \
352 umfpack demo_tools genetic_algorithms simulated_annealing \ 352 helptools fftw umfpack demo_tools genetic_algorithms \
353 parameters matio $(am__append_1) scicos . $(am__append_2) 353 simulated_annealing parameters matio $(am__append_1) scicos . \
354 $(am__append_2)
354 355
355#### Basic files #### 356#### Basic files ####
356libscilab_la_rootdir = $(mydatadir) 357libscilab_la_rootdir = $(mydatadir)
@@ -364,6 +365,7 @@ $(top_builddir)/modules/mexlib/libmex.la \
364 $(top_builddir)/modules/boolean/libsciboolean.la \ 365 $(top_builddir)/modules/boolean/libsciboolean.la \
365 $(top_builddir)/modules/cacsd/libscicacsd.la \ 366 $(top_builddir)/modules/cacsd/libscicacsd.la \
366 $(top_builddir)/modules/core/libscicore.la \ 367 $(top_builddir)/modules/core/libscicore.la \
368 $(top_builddir)/modules/call_scilab/libscicall_scilab.la \
367 $(top_builddir)/modules/data_structures/libscidata_structures.la \ 369 $(top_builddir)/modules/data_structures/libscidata_structures.la \
368 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \ 370 $(top_builddir)/modules/differential_equations/libscidifferential_equations.la \
369 $(top_builddir)/modules/double/libscidouble.la \ 371 $(top_builddir)/modules/double/libscidouble.la \
diff --git a/scilab/modules/call_scilab/etc/call_scilab.start b/scilab/modules/call_scilab/etc/call_scilab.start
index 0e7a7a8..33dc814 100644
--- a/scilab/modules/call_scilab/etc/call_scilab.start
+++ b/scilab/modules/call_scilab/etc/call_scilab.start
@@ -13,8 +13,8 @@
13 13
14// ==================================================================== 14// ====================================================================
15//Load functions libraries 15//Load functions libraries
16load('SCI/modules/call_scilab/macros/lib'); 16//load('SCI/modules/call_scilab/macros/lib');
17// ==================================================================== 17// ====================================================================
18//add help chapter 18//add help chapter
19add_module_help_chapter('call_scilab'); 19//add_module_help_chapter('call_scilab');
20// ==================================================================== 20// ====================================================================
diff --git a/scilab/modules/core/src/c/core.vcproj b/scilab/modules/core/src/c/core.vcproj
index c8607ad..6b2c2a3 100644
--- a/scilab/modules/core/src/c/core.vcproj
+++ b/scilab/modules/core/src/c/core.vcproj
@@ -45,7 +45,7 @@
45 <Tool 45 <Tool
46 Name="VCCLCompilerTool" 46 Name="VCCLCompilerTool"
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes" 48 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c"
49 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 49 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
50 BasicRuntimeChecks="0" 50 BasicRuntimeChecks="0"
51 RuntimeLibrary="3" 51 RuntimeLibrary="3"
@@ -121,7 +121,7 @@
121 <Tool 121 <Tool
122 Name="VCCLCompilerTool" 122 Name="VCCLCompilerTool"
123 Optimization="0" 123 Optimization="0"
124 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes" 124 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c"
125 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 125 PreprocessorDefinitions="_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
126 BasicRuntimeChecks="0" 126 BasicRuntimeChecks="0"
127 RuntimeLibrary="3" 127 RuntimeLibrary="3"
@@ -198,7 +198,7 @@
198 Optimization="2" 198 Optimization="2"
199 InlineFunctionExpansion="1" 199 InlineFunctionExpansion="1"
200 FavorSizeOrSpeed="1" 200 FavorSizeOrSpeed="1"
201 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes" 201 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c"
202 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 202 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
203 StringPooling="true" 203 StringPooling="true"
204 RuntimeLibrary="2" 204 RuntimeLibrary="2"
@@ -277,7 +277,7 @@
277 Optimization="2" 277 Optimization="2"
278 InlineFunctionExpansion="1" 278 InlineFunctionExpansion="1"
279 FavorSizeOrSpeed="1" 279 FavorSizeOrSpeed="1"
280 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes" 280 AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../dynamic_link/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../fileio/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../pvm/includes;../../../../libs/intl;../../../tclsci/includes/tcltk;../../../windows_tools/includes;../../../intersci/includes;../../../call_scilab/includes;../../../call_scilab/src/c"
281 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__" 281 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
282 StringPooling="true" 282 StringPooling="true"
283 RuntimeLibrary="2" 283 RuntimeLibrary="2"
@@ -351,7 +351,7 @@
351 > 351 >
352 </File> 352 </File>
353 <File 353 <File
354 RelativePath=".\CallScilab.c" 354 RelativePath="..\..\..\call_scilab\src\c\CallScilab.c"
355 > 355 >
356 </File> 356 </File>
357 <File 357 <File
@@ -395,11 +395,11 @@
395 > 395 >
396 </File> 396 </File>
397 <File 397 <File
398 RelativePath=".\fromc.c" 398 RelativePath="..\..\..\call_scilab\src\c\fromc.c"
399 > 399 >
400 </File> 400 </File>
401 <File 401 <File
402 RelativePath=".\fromjava.c" 402 RelativePath="..\..\..\call_scilab\src\c\fromjava.c"
403 > 403 >
404 </File> 404 </File>
405 <File 405 <File
@@ -467,6 +467,10 @@
467 > 467 >
468 </File> 468 </File>
469 <File 469 <File
470 RelativePath="..\..\..\call_scilab\sci_gateway\c\gw_call_scilab.c"
471 >
472 </File>
473 <File
470 RelativePath="..\..\sci_gateway\c\gw_core.c" 474 RelativePath="..\..\sci_gateway\c\gw_core.c"
471 > 475 >
472 </File> 476 </File>
@@ -643,11 +647,11 @@
643 > 647 >
644 </File> 648 </File>
645 <File 649 <File
646 RelativePath="..\..\sci_gateway\c\sci_fromc.c" 650 RelativePath="..\..\..\call_scilab\sci_gateway\c\sci_fromc.c"
647 > 651 >
648 </File> 652 </File>
649 <File 653 <File
650 RelativePath="..\..\sci_gateway\c\sci_fromjava.c" 654 RelativePath="..\..\..\call_scilab\sci_gateway\c\sci_fromjava.c"
651 > 655 >
652 </File> 656 </File>
653 <File 657 <File
@@ -992,11 +996,11 @@
992 > 996 >
993 </File> 997 </File>
994 <File 998 <File
995 RelativePath="..\..\includes\fromjava.h" 999 RelativePath=".\fromjava.h"
996 > 1000 >
997 </File> 1001 </File>
998 <File 1002 <File
999 RelativePath=".\fromjava.h" 1003 RelativePath="..\..\includes\fromjava.h"
1000 > 1004 >
1001 </File> 1005 </File>
1002 <File 1006 <File
diff --git a/scilab/modules/javasci/Javasci.vcproj b/scilab/modules/javasci/Javasci.vcproj
index 2a52915..d91aca2 100644
--- a/scilab/modules/javasci/Javasci.vcproj
+++ b/scilab/modules/javasci/Javasci.vcproj
@@ -44,7 +44,7 @@
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 Optimization="0" 46 Optimization="0"
47 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl" 47 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes"
48 PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 48 PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
49 MinimalRebuild="true" 49 MinimalRebuild="true"
50 BasicRuntimeChecks="0" 50 BasicRuntimeChecks="0"
@@ -127,7 +127,7 @@
127 <Tool 127 <Tool
128 Name="VCCLCompilerTool" 128 Name="VCCLCompilerTool"
129 Optimization="0" 129 Optimization="0"
130 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl" 130 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes"
131 PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 131 PreprocessorDefinitions="_DEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
132 MinimalRebuild="true" 132 MinimalRebuild="true"
133 BasicRuntimeChecks="0" 133 BasicRuntimeChecks="0"
@@ -208,7 +208,7 @@
208 /> 208 />
209 <Tool 209 <Tool
210 Name="VCCLCompilerTool" 210 Name="VCCLCompilerTool"
211 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl" 211 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes"
212 PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 212 PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
213 RuntimeLibrary="2" 213 RuntimeLibrary="2"
214 EnableEnhancedInstructionSet="0" 214 EnableEnhancedInstructionSet="0"
@@ -291,7 +291,7 @@
291 /> 291 />
292 <Tool 292 <Tool
293 Name="VCCLCompilerTool" 293 Name="VCCLCompilerTool"
294 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl" 294 AdditionalIncludeDirectories="includes;../../libs/MALLOC/includes;../../libs/doublylinkedlist/includes;../core/includes;../output_stream/includes;../tclsci/includes;../tclsci/includes/tcltk/include;../../java/jdk/include/;../../java/jdk/include/win32;../../libs/intl;../call_scilab/includes"
295 PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE" 295 PreprocessorDefinitions="NDEBUG;_USRDLL;JAVA_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
296 RuntimeLibrary="2" 296 RuntimeLibrary="2"
297 EnableEnhancedInstructionSet="0" 297 EnableEnhancedInstructionSet="0"