summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-05-21 15:02:44 +0200
committerAllan CORNET <allan.cornet@scilab.org>2010-05-21 16:01:28 +0200
commitf06b8a6995add91d1c479628fe91a3901f832476 (patch)
tree54fc5502432d8c8f66969a294772b1223f89ebfd /scilab/modules
parentbcb0dc85d211d0339cbb1a954974bdcc163d0a0c (diff)
downloadscilab-f06b8a6995add91d1c479628fe91a3901f832476.zip
scilab-f06b8a6995add91d1c479628fe91a3901f832476.tar.gz
build scilab x64 with VS 2010 (compatibility)
Change-Id: Id71a4012699bef52930cf43bef0352eb7635dcd5
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.vcproj26
-rw-r--r--scilab/modules/action_binding/src/java/action_binding-JAVA.vcproj2
-rw-r--r--scilab/modules/api_scilab/api_scilab.vcproj26
-rw-r--r--scilab/modules/arnoldi/arnoldi.vcproj26
-rw-r--r--scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj10
-rw-r--r--scilab/modules/boolean/.gitignore5
-rw-r--r--scilab/modules/boolean/boolean.iss3
-rw-r--r--scilab/modules/boolean/src/c/DllmainBoolean.c33
-rw-r--r--scilab/modules/boolean/src/c/LibScilab_Import.def20
-rw-r--r--scilab/modules/boolean/src/c/boolean.rc (renamed from scilab/modules/sparse/src/c/sparse.rc)8
-rw-r--r--scilab/modules/boolean/src/c/boolean.vcproj233
-rw-r--r--scilab/modules/boolean/src/c/boolean_f_Import.def9
-rw-r--r--scilab/modules/boolean/src/c/boolean_header.def8
-rw-r--r--scilab/modules/boolean/src/fortran/LibScilab_Import.def30
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_Import.def4
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.rc96
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.vfproj106
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f2c.vcproj205
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f_header.def8
-rw-r--r--scilab/modules/boolean/src/fortran/logic.f6
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.vcproj18
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f.vfproj8
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f2c.vcproj26
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj8
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcproj26
-rw-r--r--scilab/modules/call_scilab/call_scilab.vcproj26
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj4
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj4
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj4
-rw-r--r--scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj4
-rw-r--r--scilab/modules/completion/src/c/completion.vcproj26
-rw-r--r--scilab/modules/completion/src/java/completion-JAVA.vcproj2
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.vcproj24
-rw-r--r--scilab/modules/console/src/c/console.vcproj26
-rw-r--r--scilab/modules/console/src/java/console-JAVA.vcproj2
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.vcproj24
-rw-r--r--scilab/modules/core/src/c/core.vcproj18
-rw-r--r--scilab/modules/core/src/cpp/hashtable_core.cpp4
-rw-r--r--scilab/modules/core/src/fortran/core_f.vfproj8
-rw-r--r--scilab/modules/core/src/fortran/core_f2c.vcproj26
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.vcproj18
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.vfproj8
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj26
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.vcproj18
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj8
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f2c.vcproj26
-rw-r--r--scilab/modules/double/double.iss2
-rw-r--r--scilab/modules/double/src/c/LibScilab_Import.def1
-rw-r--r--scilab/modules/double/src/c/double.vcproj26
-rw-r--r--scilab/modules/double/src/fortran/double_f.vfproj8
-rw-r--r--scilab/modules/double/src/fortran/double_f2c.vcproj26
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.vcproj26
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f.vfproj8
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f2c.vcproj26
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.vcproj18
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.vfproj8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f2c.vcproj26
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj26
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.vfproj8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f2c.vcproj26
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.vfproj8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f2c.vcproj26
-rw-r--r--scilab/modules/fftw/fftw.vcproj24
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.vcproj24
-rw-r--r--scilab/modules/fileio/fileio.vcproj24
-rw-r--r--scilab/modules/functions/scripts/buildmacros/BuildMacros.vcproj2
-rw-r--r--scilab/modules/functions/src/c/functions.vcproj26
-rw-r--r--scilab/modules/functions/src/fortran/functions_f.vfproj8
-rw-r--r--scilab/modules/functions/src/fortran/functions_f2c.vcproj26
-rw-r--r--scilab/modules/graph/src/java/graph-JAVA.vcproj2
-rw-r--r--scilab/modules/graphic_export/graphic_export.vcproj24
-rw-r--r--scilab/modules/graphic_export/src/java/graphic_export-JAVA.vcproj2
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.vcproj24
-rw-r--r--scilab/modules/graphics/graphics.vcproj24
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.vcproj24
-rw-r--r--scilab/modules/gui/src/c/gui.vcproj26
-rw-r--r--scilab/modules/gui/src/java/gui-JAVA.vcproj2
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.vcproj26
-rw-r--r--scilab/modules/hdf5/src/java/hdf5-JAVA.vcproj2
-rw-r--r--scilab/modules/helptools/src/BuildChm/BuildChm.vcproj2
-rw-r--r--scilab/modules/helptools/src/BuildHelp.vcproj2
-rw-r--r--scilab/modules/helptools/src/CheckHelp/CheckHelp.vcproj2
-rw-r--r--scilab/modules/helptools/src/c/helptools.vcproj26
-rw-r--r--scilab/modules/helptools/src/java/helptools-JAVA.vcproj2
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.vcproj26
-rw-r--r--scilab/modules/history_manager/src/java/history_manager-JAVA.vcproj2
-rw-r--r--scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj24
-rw-r--r--scilab/modules/integer/src/c/integer.vcproj26
-rw-r--r--scilab/modules/integer/src/fortran/integer_f.vfproj8
-rw-r--r--scilab/modules/integer/src/fortran/integer_f2c.vcproj26
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.vcproj26
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.vfproj8
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f2c.vcproj26
-rw-r--r--scilab/modules/intersci/src/exe/intersciexe/intersciexe.vcproj2
-rw-r--r--scilab/modules/intersci/src/exe/interscin/interscin.vcproj21
-rw-r--r--scilab/modules/intersci/src/lib/intersci.vcproj24
-rw-r--r--scilab/modules/io/src/c/io.vcproj26
-rw-r--r--scilab/modules/io/src/fortran/io_f.vfproj8
-rw-r--r--scilab/modules/io/src/fortran/io_f2c.vcproj26
-rw-r--r--scilab/modules/javasci/Javasci.vcproj30
-rw-r--r--scilab/modules/javasci/src/java/javasci-JAVA.vcproj2
-rw-r--r--scilab/modules/jvm/libjvm.vcproj2
-rw-r--r--scilab/modules/jvm/src/java/jvm-JAVA.vcproj2
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.vcproj26
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f.vfproj8
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f2c.vcproj26
-rw-r--r--scilab/modules/localization/src/java/localization-JAVA.vcproj2
-rw-r--r--scilab/modules/localization/src/localization.vcproj30
-rw-r--r--scilab/modules/matio/matio.vcproj24
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.vcproj30
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.vcproj30
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.vcproj30
-rw-r--r--scilab/modules/optimization/src/c/optimization.vcproj26
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f.vfproj8
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f2c.vcproj26
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.vcproj26
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f.vfproj8
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f2c.vcproj26
-rw-r--r--scilab/modules/parameters/parameters.vcproj26
-rw-r--r--scilab/modules/polynomials/src/c/polynomials.vcproj26
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.vfproj8
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f2c.vcproj26
-rw-r--r--scilab/modules/pvm/pvm.vcproj24
-rw-r--r--scilab/modules/randlib/src/c/randlib.vcproj26
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f.vfproj8
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f2c.vcproj26
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.vcproj24
-rw-r--r--scilab/modules/renderer/renderer.vcproj2
-rw-r--r--scilab/modules/renderer/src/java/renderer-JAVA.vcproj2
-rw-r--r--scilab/modules/scicos/src/c/ezxml.c8
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.vcproj26
-rw-r--r--scilab/modules/scicos/src/c/scicos.vcproj26
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.vfproj8
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f2c.vcproj26
-rw-r--r--scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj2
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj26
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj26
-rw-r--r--scilab/modules/scicos_blocks/src/c/scoWindowScope.c2
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj8
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f2c.vcproj26
-rw-r--r--scilab/modules/shell/src/c/shell.vcproj26
-rw-r--r--scilab/modules/shell/src/java/shell-JAVA.vcproj2
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.vcproj26
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.vfproj8
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f2c.vcproj26
-rw-r--r--scilab/modules/sound/sound.vcproj24
-rw-r--r--scilab/modules/sound/src/nosound/nosound.vcproj24
-rw-r--r--scilab/modules/sparse/src/c/sparse.vcproj40
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.vfproj8
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f2c.vcproj32
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcproj22
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.vfproj8
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f2c.vcproj26
-rw-r--r--scilab/modules/spreadsheet/spreadsheet.vcproj24
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj24
-rw-r--r--scilab/modules/statistics/src/c/statistics.vcproj26
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd.vfproj (renamed from scilab/modules/statistics/src/dcdflib/dcd_f/dcd_DLL.vfproj)8
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_DLL_f2c.vcproj36
-rw-r--r--scilab/modules/string/src/c/string.vcproj26
-rw-r--r--scilab/modules/string/src/fortran/string_f.vfproj8
-rw-r--r--scilab/modules/string/src/fortran/string_f2c.vcproj26
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.vcproj26
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.vfproj8
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f2c.vcproj26
-rw-r--r--scilab/modules/tclsci/tclsci.vcproj24
-rw-r--r--scilab/modules/time/time.vcproj26
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.vcproj26
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.vcproj26
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.vcproj24
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.vcproj22
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.vcproj26
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.vcproj26
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.vcproj24
-rw-r--r--scilab/modules/xcos/src/c/xcos.vcproj26
-rw-r--r--scilab/modules/xcos/src/java/xcos-JAVA.vcproj2
-rw-r--r--scilab/modules/xpad/src/c/xpad.vcproj26
-rw-r--r--scilab/modules/xpad/src/java/xpad-JAVA.vcproj2
177 files changed, 1613 insertions, 2049 deletions
diff --git a/scilab/modules/action_binding/src/c/action_binding.vcproj b/scilab/modules/action_binding/src/c/action_binding.vcproj
index 6894cc1..b97f786 100644
--- a/scilab/modules/action_binding/src/c/action_binding.vcproj
+++ b/scilab/modules/action_binding/src/c/action_binding.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -35,7 +35,6 @@
35 <Tool 35 <Tool
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38
39 <Tool 38 <Tool
40 Name="VCMIDLTool" 39 Name="VCMIDLTool"
41 /> 40 />
@@ -50,7 +49,6 @@
50 RuntimeLibrary="3" 49 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 50 UsePrecompiledHeader="0"
52 WarningLevel="3" 51 WarningLevel="3"
53
54 DebugInformationFormat="3" 52 DebugInformationFormat="3"
55 /> 53 />
56 <Tool 54 <Tool
@@ -67,14 +65,14 @@
67 <Tool 65 <Tool
68 Name="VCLinkerTool" 66 Name="VCLinkerTool"
69 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib" 67 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib"
70 OutputFile="../../../../bin/sciaction_binding.dll" 68 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
71 LinkIncremental="1" 69 LinkIncremental="1"
72 ModuleDefinitionFile="" 70 ModuleDefinitionFile=""
73 GenerateDebugInformation="true" 71 GenerateDebugInformation="true"
74 SubSystem="2" 72 SubSystem="2"
75 RandomizedBaseAddress="1" 73 RandomizedBaseAddress="1"
76 DataExecutionPrevention="0" 74 DataExecutionPrevention="0"
77 ImportLibrary="../../../../bin/sciaction_binding.lib" 75 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
78 TargetMachine="1" 76 TargetMachine="1"
79 CLRUnmanagedCodeCheck="true" 77 CLRUnmanagedCodeCheck="true"
80 /> 78 />
@@ -117,7 +115,6 @@
117 <Tool 115 <Tool
118 Name="VCXMLDataGeneratorTool" 116 Name="VCXMLDataGeneratorTool"
119 /> 117 />
120
121 <Tool 118 <Tool
122 Name="VCMIDLTool" 119 Name="VCMIDLTool"
123 TargetEnvironment="3" 120 TargetEnvironment="3"
@@ -132,7 +129,6 @@
132 RuntimeLibrary="3" 129 RuntimeLibrary="3"
133 UsePrecompiledHeader="0" 130 UsePrecompiledHeader="0"
134 WarningLevel="3" 131 WarningLevel="3"
135
136 DebugInformationFormat="3" 132 DebugInformationFormat="3"
137 /> 133 />
138 <Tool 134 <Tool
@@ -149,14 +145,14 @@
149 <Tool 145 <Tool
150 Name="VCLinkerTool" 146 Name="VCLinkerTool"
151 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib" 147 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib"
152 OutputFile="../../../../bin/sciaction_binding.dll" 148 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
153 LinkIncremental="1" 149 LinkIncremental="1"
154 ModuleDefinitionFile="" 150 ModuleDefinitionFile=""
155 GenerateDebugInformation="true" 151 GenerateDebugInformation="true"
156 SubSystem="2" 152 SubSystem="2"
157 RandomizedBaseAddress="1" 153 RandomizedBaseAddress="1"
158 DataExecutionPrevention="0" 154 DataExecutionPrevention="0"
159 ImportLibrary="../../../../bin/sciaction_binding.lib" 155 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
160 TargetMachine="17" 156 TargetMachine="17"
161 CLRUnmanagedCodeCheck="true" 157 CLRUnmanagedCodeCheck="true"
162 /> 158 />
@@ -200,7 +196,6 @@
200 <Tool 196 <Tool
201 Name="VCXMLDataGeneratorTool" 197 Name="VCXMLDataGeneratorTool"
202 /> 198 />
203
204 <Tool 199 <Tool
205 Name="VCMIDLTool" 200 Name="VCMIDLTool"
206 /> 201 />
@@ -217,7 +212,6 @@
217 EnableEnhancedInstructionSet="0" 212 EnableEnhancedInstructionSet="0"
218 UsePrecompiledHeader="0" 213 UsePrecompiledHeader="0"
219 WarningLevel="3" 214 WarningLevel="3"
220
221 DebugInformationFormat="3" 215 DebugInformationFormat="3"
222 /> 216 />
223 <Tool 217 <Tool
@@ -234,7 +228,7 @@
234 <Tool 228 <Tool
235 Name="VCLinkerTool" 229 Name="VCLinkerTool"
236 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib" 230 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib"
237 OutputFile="../../../../bin/sciaction_binding.dll" 231 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
238 LinkIncremental="1" 232 LinkIncremental="1"
239 ModuleDefinitionFile="" 233 ModuleDefinitionFile=""
240 GenerateDebugInformation="false" 234 GenerateDebugInformation="false"
@@ -244,7 +238,7 @@
244 LinkTimeCodeGeneration="0" 238 LinkTimeCodeGeneration="0"
245 RandomizedBaseAddress="1" 239 RandomizedBaseAddress="1"
246 DataExecutionPrevention="0" 240 DataExecutionPrevention="0"
247 ImportLibrary="../../../../bin/sciaction_binding.lib" 241 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
248 TargetMachine="1" 242 TargetMachine="1"
249 CLRUnmanagedCodeCheck="true" 243 CLRUnmanagedCodeCheck="true"
250 /> 244 />
@@ -288,7 +282,6 @@
288 <Tool 282 <Tool
289 Name="VCXMLDataGeneratorTool" 283 Name="VCXMLDataGeneratorTool"
290 /> 284 />
291
292 <Tool 285 <Tool
293 Name="VCMIDLTool" 286 Name="VCMIDLTool"
294 TargetEnvironment="3" 287 TargetEnvironment="3"
@@ -305,7 +298,6 @@
305 EnableEnhancedInstructionSet="0" 298 EnableEnhancedInstructionSet="0"
306 UsePrecompiledHeader="0" 299 UsePrecompiledHeader="0"
307 WarningLevel="3" 300 WarningLevel="3"
308
309 DebugInformationFormat="3" 301 DebugInformationFormat="3"
310 /> 302 />
311 <Tool 303 <Tool
@@ -322,7 +314,7 @@
322 <Tool 314 <Tool
323 Name="VCLinkerTool" 315 Name="VCLinkerTool"
324 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib" 316 AdditionalDependencies="LibScilab.lib libjvm.lib scilab_windows.lib scilocalization.lib"
325 OutputFile="../../../../bin/sciaction_binding.dll" 317 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
326 LinkIncremental="1" 318 LinkIncremental="1"
327 ModuleDefinitionFile="" 319 ModuleDefinitionFile=""
328 GenerateDebugInformation="false" 320 GenerateDebugInformation="false"
@@ -332,7 +324,7 @@
332 LinkTimeCodeGeneration="0" 324 LinkTimeCodeGeneration="0"
333 RandomizedBaseAddress="1" 325 RandomizedBaseAddress="1"
334 DataExecutionPrevention="0" 326 DataExecutionPrevention="0"
335 ImportLibrary="../../../../bin/sciaction_binding.lib" 327 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
336 TargetMachine="17" 328 TargetMachine="17"
337 CLRUnmanagedCodeCheck="true" 329 CLRUnmanagedCodeCheck="true"
338 /> 330 />
diff --git a/scilab/modules/action_binding/src/java/action_binding-JAVA.vcproj b/scilab/modules/action_binding/src/java/action_binding-JAVA.vcproj
index e0f6296..e51ce84 100644
--- a/scilab/modules/action_binding/src/java/action_binding-JAVA.vcproj
+++ b/scilab/modules/action_binding/src/java/action_binding-JAVA.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
diff --git a/scilab/modules/api_scilab/api_scilab.vcproj b/scilab/modules/api_scilab/api_scilab.vcproj
index c7945a8..caeaff4 100644
--- a/scilab/modules/api_scilab/api_scilab.vcproj
+++ b/scilab/modules/api_scilab/api_scilab.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -35,7 +35,6 @@
35 <Tool 35 <Tool
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38
39 <Tool 38 <Tool
40 Name="VCMIDLTool" 39 Name="VCMIDLTool"
41 /> 40 />
@@ -50,7 +49,6 @@
50 RuntimeLibrary="3" 49 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 50 UsePrecompiledHeader="0"
52 WarningLevel="3" 51 WarningLevel="3"
53
54 DebugInformationFormat="3" 52 DebugInformationFormat="3"
55 /> 53 />
56 <Tool 54 <Tool
@@ -67,14 +65,14 @@
67 <Tool 65 <Tool
68 Name="VCLinkerTool" 66 Name="VCLinkerTool"
69 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib" 67 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib"
70 OutputFile="../../bin/$(ProjectName).dll" 68 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
71 LinkIncremental="1" 69 LinkIncremental="1"
72 ModuleDefinitionFile="api_scilab_export.def" 70 ModuleDefinitionFile="api_scilab_export.def"
73 GenerateDebugInformation="true" 71 GenerateDebugInformation="true"
74 SubSystem="2" 72 SubSystem="2"
75 RandomizedBaseAddress="1" 73 RandomizedBaseAddress="1"
76 DataExecutionPrevention="0" 74 DataExecutionPrevention="0"
77 ImportLibrary="../../bin/$(ProjectName).lib" 75 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
78 TargetMachine="1" 76 TargetMachine="1"
79 CLRUnmanagedCodeCheck="true" 77 CLRUnmanagedCodeCheck="true"
80 /> 78 />
@@ -116,7 +114,6 @@
116 <Tool 114 <Tool
117 Name="VCXMLDataGeneratorTool" 115 Name="VCXMLDataGeneratorTool"
118 /> 116 />
119
120 <Tool 117 <Tool
121 Name="VCMIDLTool" 118 Name="VCMIDLTool"
122 TargetEnvironment="3" 119 TargetEnvironment="3"
@@ -131,7 +128,6 @@
131 RuntimeLibrary="3" 128 RuntimeLibrary="3"
132 UsePrecompiledHeader="0" 129 UsePrecompiledHeader="0"
133 WarningLevel="3" 130 WarningLevel="3"
134
135 DebugInformationFormat="3" 131 DebugInformationFormat="3"
136 /> 132 />
137 <Tool 133 <Tool
@@ -148,14 +144,14 @@
148 <Tool 144 <Tool
149 Name="VCLinkerTool" 145 Name="VCLinkerTool"
150 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib" 146 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib"
151 OutputFile="../../bin/$(ProjectName).dll" 147 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
152 LinkIncremental="1" 148 LinkIncremental="1"
153 ModuleDefinitionFile="api_scilab_export.def" 149 ModuleDefinitionFile="api_scilab_export.def"
154 GenerateDebugInformation="true" 150 GenerateDebugInformation="true"
155 SubSystem="2" 151 SubSystem="2"
156 RandomizedBaseAddress="1" 152 RandomizedBaseAddress="1"
157 DataExecutionPrevention="0" 153 DataExecutionPrevention="0"
158 ImportLibrary="../../bin/$(ProjectName).lib" 154 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
159 TargetMachine="17" 155 TargetMachine="17"
160 CLRUnmanagedCodeCheck="true" 156 CLRUnmanagedCodeCheck="true"
161 /> 157 />
@@ -198,7 +194,6 @@
198 <Tool 194 <Tool
199 Name="VCXMLDataGeneratorTool" 195 Name="VCXMLDataGeneratorTool"
200 /> 196 />
201
202 <Tool 197 <Tool
203 Name="VCMIDLTool" 198 Name="VCMIDLTool"
204 /> 199 />
@@ -216,7 +211,6 @@
216 EnableEnhancedInstructionSet="0" 211 EnableEnhancedInstructionSet="0"
217 UsePrecompiledHeader="0" 212 UsePrecompiledHeader="0"
218 WarningLevel="3" 213 WarningLevel="3"
219
220 DebugInformationFormat="0" 214 DebugInformationFormat="0"
221 /> 215 />
222 <Tool 216 <Tool
@@ -233,7 +227,7 @@
233 <Tool 227 <Tool
234 Name="VCLinkerTool" 228 Name="VCLinkerTool"
235 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib" 229 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib"
236 OutputFile="../../bin/$(ProjectName).dll" 230 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
237 LinkIncremental="1" 231 LinkIncremental="1"
238 ModuleDefinitionFile="api_scilab_export.def" 232 ModuleDefinitionFile="api_scilab_export.def"
239 GenerateDebugInformation="false" 233 GenerateDebugInformation="false"
@@ -243,7 +237,7 @@
243 LinkTimeCodeGeneration="0" 237 LinkTimeCodeGeneration="0"
244 RandomizedBaseAddress="1" 238 RandomizedBaseAddress="1"
245 DataExecutionPrevention="0" 239 DataExecutionPrevention="0"
246 ImportLibrary="../../bin/$(ProjectName).lib" 240 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
247 TargetMachine="1" 241 TargetMachine="1"
248 CLRUnmanagedCodeCheck="true" 242 CLRUnmanagedCodeCheck="true"
249 /> 243 />
@@ -286,7 +280,6 @@
286 <Tool 280 <Tool
287 Name="VCXMLDataGeneratorTool" 281 Name="VCXMLDataGeneratorTool"
288 /> 282 />
289
290 <Tool 283 <Tool
291 Name="VCMIDLTool" 284 Name="VCMIDLTool"
292 TargetEnvironment="3" 285 TargetEnvironment="3"
@@ -304,7 +297,6 @@
304 EnableEnhancedInstructionSet="0" 297 EnableEnhancedInstructionSet="0"
305 UsePrecompiledHeader="0" 298 UsePrecompiledHeader="0"
306 WarningLevel="3" 299 WarningLevel="3"
307
308 DebugInformationFormat="0" 300 DebugInformationFormat="0"
309 /> 301 />
310 <Tool 302 <Tool
@@ -321,7 +313,7 @@
321 <Tool 313 <Tool
322 Name="VCLinkerTool" 314 Name="VCLinkerTool"
323 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib" 315 AdditionalDependencies="LibScilab.lib string.lib scilocalization.lib scilab_windows.lib"
324 OutputFile="../../bin/$(ProjectName).dll" 316 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
325 LinkIncremental="1" 317 LinkIncremental="1"
326 ModuleDefinitionFile="api_scilab_export.def" 318 ModuleDefinitionFile="api_scilab_export.def"
327 GenerateDebugInformation="false" 319 GenerateDebugInformation="false"
@@ -331,7 +323,7 @@
331 LinkTimeCodeGeneration="0" 323 LinkTimeCodeGeneration="0"
332 RandomizedBaseAddress="1" 324 RandomizedBaseAddress="1"
333 DataExecutionPrevention="0" 325 DataExecutionPrevention="0"
334 ImportLibrary="../../bin/$(ProjectName).lib" 326 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
335 TargetMachine="17" 327 TargetMachine="17"
336 CLRUnmanagedCodeCheck="true" 328 CLRUnmanagedCodeCheck="true"
337 /> 329 />
diff --git a/scilab/modules/arnoldi/arnoldi.vcproj b/scilab/modules/arnoldi/arnoldi.vcproj
index 47a01da..11c96c3 100644
--- a/scilab/modules/arnoldi/arnoldi.vcproj
+++ b/scilab/modules/arnoldi/arnoldi.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -35,7 +35,6 @@
35 <Tool 35 <Tool
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38
39 <Tool 38 <Tool
40 Name="VCMIDLTool" 39 Name="VCMIDLTool"
41 /> 40 />
@@ -50,7 +49,6 @@
50 RuntimeLibrary="3" 49 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 50 UsePrecompiledHeader="0"
52 WarningLevel="3" 51 WarningLevel="3"
53
54 DebugInformationFormat="3" 52 DebugInformationFormat="3"
55 /> 53 />
56 <Tool 54 <Tool
@@ -67,14 +65,14 @@
67 <Tool 65 <Tool
68 Name="VCLinkerTool" 66 Name="VCLinkerTool"
69 AdditionalDependencies="LibScilab.lib" 67 AdditionalDependencies="LibScilab.lib"
70 OutputFile="../../bin/$(ProjectName).dll" 68 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
71 LinkIncremental="1" 69 LinkIncremental="1"
72 ModuleDefinitionFile="" 70 ModuleDefinitionFile=""
73 GenerateDebugInformation="true" 71 GenerateDebugInformation="true"
74 SubSystem="2" 72 SubSystem="2"
75 RandomizedBaseAddress="1" 73 RandomizedBaseAddress="1"
76 DataExecutionPrevention="0" 74 DataExecutionPrevention="0"
77 ImportLibrary="../../bin/$(ProjectName).lib" 75 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
78 TargetMachine="1" 76 TargetMachine="1"
79 CLRUnmanagedCodeCheck="true" 77 CLRUnmanagedCodeCheck="true"
80 /> 78 />
@@ -116,7 +114,6 @@
116 <Tool 114 <Tool
117 Name="VCXMLDataGeneratorTool" 115 Name="VCXMLDataGeneratorTool"
118 /> 116 />
119
120 <Tool 117 <Tool
121 Name="VCMIDLTool" 118 Name="VCMIDLTool"
122 TargetEnvironment="3" 119 TargetEnvironment="3"
@@ -131,7 +128,6 @@
131 RuntimeLibrary="3" 128 RuntimeLibrary="3"
132 UsePrecompiledHeader="0" 129 UsePrecompiledHeader="0"
133 WarningLevel="3" 130 WarningLevel="3"
134
135 DebugInformationFormat="3" 131 DebugInformationFormat="3"
136 /> 132 />
137 <Tool 133 <Tool
@@ -148,14 +144,14 @@
148 <Tool 144 <Tool
149 Name="VCLinkerTool" 145 Name="VCLinkerTool"
150 AdditionalDependencies="LibScilab.lib" 146 AdditionalDependencies="LibScilab.lib"
151 OutputFile="../../bin/$(ProjectName).dll" 147 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
152 LinkIncremental="1" 148 LinkIncremental="1"
153 ModuleDefinitionFile="" 149 ModuleDefinitionFile=""
154 GenerateDebugInformation="true" 150 GenerateDebugInformation="true"
155 SubSystem="2" 151 SubSystem="2"
156 RandomizedBaseAddress="1" 152 RandomizedBaseAddress="1"
157 DataExecutionPrevention="0" 153 DataExecutionPrevention="0"
158 ImportLibrary="../../bin/$(ProjectName).lib" 154 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
159 TargetMachine="17" 155 TargetMachine="17"
160 CLRUnmanagedCodeCheck="true" 156 CLRUnmanagedCodeCheck="true"
161 /> 157 />
@@ -198,7 +194,6 @@
198 <Tool 194 <Tool
199 Name="VCXMLDataGeneratorTool" 195 Name="VCXMLDataGeneratorTool"
200 /> 196 />
201
202 <Tool 197 <Tool
203 Name="VCMIDLTool" 198 Name="VCMIDLTool"
204 /> 199 />
@@ -216,7 +211,6 @@
216 EnableEnhancedInstructionSet="0" 211 EnableEnhancedInstructionSet="0"
217 UsePrecompiledHeader="0" 212 UsePrecompiledHeader="0"
218 WarningLevel="3" 213 WarningLevel="3"
219
220 DebugInformationFormat="0" 214 DebugInformationFormat="0"
221 /> 215 />
222 <Tool 216 <Tool
@@ -233,7 +227,7 @@
233 <Tool 227 <Tool
234 Name="VCLinkerTool" 228 Name="VCLinkerTool"
235 AdditionalDependencies="LibScilab.lib" 229 AdditionalDependencies="LibScilab.lib"
236 OutputFile="../../bin/$(ProjectName).dll" 230 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
237 LinkIncremental="1" 231 LinkIncremental="1"
238 ModuleDefinitionFile="" 232 ModuleDefinitionFile=""
239 GenerateDebugInformation="false" 233 GenerateDebugInformation="false"
@@ -244,7 +238,7 @@
244 LinkTimeCodeGeneration="0" 238 LinkTimeCodeGeneration="0"
245 RandomizedBaseAddress="1" 239 RandomizedBaseAddress="1"
246 DataExecutionPrevention="0" 240 DataExecutionPrevention="0"
247 ImportLibrary="../../bin/$(ProjectName).lib" 241 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
248 TargetMachine="1" 242 TargetMachine="1"
249 CLRUnmanagedCodeCheck="true" 243 CLRUnmanagedCodeCheck="true"
250 /> 244 />
@@ -287,7 +281,6 @@
287 <Tool 281 <Tool
288 Name="VCXMLDataGeneratorTool" 282 Name="VCXMLDataGeneratorTool"
289 /> 283 />
290
291 <Tool 284 <Tool
292 Name="VCMIDLTool" 285 Name="VCMIDLTool"
293 TargetEnvironment="3" 286 TargetEnvironment="3"
@@ -305,7 +298,6 @@
305 EnableEnhancedInstructionSet="0" 298 EnableEnhancedInstructionSet="0"
306 UsePrecompiledHeader="0" 299 UsePrecompiledHeader="0"
307 WarningLevel="3" 300 WarningLevel="3"
308
309 DebugInformationFormat="0" 301 DebugInformationFormat="0"
310 /> 302 />
311 <Tool 303 <Tool
@@ -322,7 +314,7 @@
322 <Tool 314 <Tool
323 Name="VCLinkerTool" 315 Name="VCLinkerTool"
324 AdditionalDependencies="LibScilab.lib" 316 AdditionalDependencies="LibScilab.lib"
325 OutputFile="../../bin/$(ProjectName).dll" 317 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
326 LinkIncremental="1" 318 LinkIncremental="1"
327 ModuleDefinitionFile="" 319 ModuleDefinitionFile=""
328 GenerateDebugInformation="false" 320 GenerateDebugInformation="false"
@@ -333,7 +325,7 @@
333 LinkTimeCodeGeneration="0" 325 LinkTimeCodeGeneration="0"
334 RandomizedBaseAddress="1" 326 RandomizedBaseAddress="1"
335 DataExecutionPrevention="0" 327 DataExecutionPrevention="0"
336 ImportLibrary="../../bin/$(ProjectName).lib" 328 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
337 TargetMachine="17" 329 TargetMachine="17"
338 CLRUnmanagedCodeCheck="true" 330 CLRUnmanagedCodeCheck="true"
339 /> 331 />
diff --git a/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj b/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj
index 6325b27..bcf5966 100644
--- a/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj
+++ b/scilab/modules/arnoldi/src/arpack/arpack_f/arpack_DLL_f2c.vcproj
@@ -36,10 +36,7 @@
36 <Tool 36 <Tool
37 Name="VCCustomBuildTool" 37 Name="VCCustomBuildTool"
38 /> 38 />
39 <Tool 39
40 Name="VCWebServiceProxyGeneratorTool"
41 ExecutionBucket="4"
42 />
43 <Tool 40 <Tool
44 Name="VCXMLDataGeneratorTool" 41 Name="VCXMLDataGeneratorTool"
45 /> 42 />
@@ -210,10 +207,7 @@
210 <Tool 207 <Tool
211 Name="VCCustomBuildTool" 208 Name="VCCustomBuildTool"
212 /> 209 />
213 <Tool 210
214 Name="VCWebServiceProxyGeneratorTool"
215 ExecutionBucket="4"
216 />
217 <Tool 211 <Tool
218 Name="VCXMLDataGeneratorTool" 212 Name="VCXMLDataGeneratorTool"
219 /> 213 />
diff --git a/scilab/modules/boolean/.gitignore b/scilab/modules/boolean/.gitignore
new file mode 100644
index 0000000..4f038c3
--- /dev/null
+++ b/scilab/modules/boolean/.gitignore
@@ -0,0 +1,5 @@
1#
2#generated .def files (windows)
3#
4boolean_f.def
5boolean_export.def \ No newline at end of file
diff --git a/scilab/modules/boolean/boolean.iss b/scilab/modules/boolean/boolean.iss
index b7ea3b0..bf727eb 100644
--- a/scilab/modules/boolean/boolean.iss
+++ b/scilab/modules/boolean/boolean.iss
@@ -17,6 +17,9 @@
17; 17;
18#define BOOLEAN "boolean" 18#define BOOLEAN "boolean"
19; 19;
20Source: bin\{#BOOLEAN}.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
21Source: bin\boolean_f.dll; DestDir: {app}\bin; Components: {#COMPN_SCILAB}
22;
20Source: modules\{#BOOLEAN}\VERSION.xml; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB} 23Source: modules\{#BOOLEAN}\VERSION.xml; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
21Source: modules\{#BOOLEAN}\readme.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB} 24Source: modules\{#BOOLEAN}\readme.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
22Source: modules\{#BOOLEAN}\license.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB} 25Source: modules\{#BOOLEAN}\license.txt; DestDir: {app}\modules\{#BOOLEAN}; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/boolean/src/c/DllmainBoolean.c b/scilab/modules/boolean/src/c/DllmainBoolean.c
new file mode 100644
index 0000000..7c572af
--- /dev/null
+++ b/scilab/modules/boolean/src/c/DllmainBoolean.c
@@ -0,0 +1,33 @@
1/*
2 * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3 * Copyright (C) 2010 - DIGITEO - Allan CORNET
4 *
5 * This file must be used under the terms of the CeCILL.
6 * This source file is licensed as described in the file COPYING, which
7 * you should have received as part of this distribution. The terms
8 * are also available at
9 * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
10 *
11 */
12
13#include <windows.h>
14/*--------------------------------------------------------------------------*/
15#pragma comment(lib,"../../../../bin/libintl.lib")
16/*--------------------------------------------------------------------------*/
17int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)
18{
19 switch (reason)
20 {
21 case DLL_PROCESS_ATTACH:
22 break;
23 case DLL_PROCESS_DETACH:
24 break;
25 case DLL_THREAD_ATTACH:
26 break;
27 case DLL_THREAD_DETACH:
28 break;
29 }
30 return 1;
31}
32/*--------------------------------------------------------------------------*/
33
diff --git a/scilab/modules/boolean/src/c/LibScilab_Import.def b/scilab/modules/boolean/src/c/LibScilab_Import.def
new file mode 100644
index 0000000..12bd929
--- /dev/null
+++ b/scilab/modules/boolean/src/c/LibScilab_Import.def
@@ -0,0 +1,20 @@
1 LIBRARY Libscilab.dll
2
3
4EXPORTS
5;
6;core
7;
8callFunctionFromGateway
9checkrhs_
10checklhs_
11vartype_
12overload_
13getrhsvar_
14iop_
15vstk_
16com_
17stack_
18intersci_
19putlhsvar_
20createvar_ \ No newline at end of file
diff --git a/scilab/modules/sparse/src/c/sparse.rc b/scilab/modules/boolean/src/c/boolean.rc
index e775fe5..fa7b22f 100644
--- a/scilab/modules/sparse/src/c/sparse.rc
+++ b/scilab/modules/boolean/src/c/boolean.rc
@@ -64,12 +64,12 @@ BEGIN
64 BEGIN 64 BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "sparse module" 67 VALUE "FileDescription", "boolean module"
68 VALUE "FileVersion", "5, 3, 0, 0" 68 VALUE "FileVersion", "5, 3, 0, 0"
69 VALUE "InternalName", "sparse module" 69 VALUE "InternalName", "boolean module"
70 VALUE "LegalCopyright", "Copyright (C) 2010" 70 VALUE "LegalCopyright", "Copyright (C) 2010"
71 VALUE "OriginalFilename", "sparse.dll" 71 VALUE "OriginalFilename", "boolean.dll"
72 VALUE "ProductName", "sparse module" 72 VALUE "ProductName", "boolean module"
73 VALUE "ProductVersion", "5, 3, 0, 0" 73 VALUE "ProductVersion", "5, 3, 0, 0"
74 END 74 END
75 END 75 END
diff --git a/scilab/modules/boolean/src/c/boolean.vcproj b/scilab/modules/boolean/src/c/boolean.vcproj
index d70bd95..fcb3e81 100644
--- a/scilab/modules/boolean/src/c/boolean.vcproj
+++ b/scilab/modules/boolean/src/c/boolean.vcproj
@@ -1,10 +1,11 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
5 Name="boolean" 5 Name="boolean"
6 ProjectGUID="{8AB8ECEC-8C22-475E-80D0-E14696F5A19B}" 6 ProjectGUID="{8AB8ECEC-8C22-475E-80D0-E14696F5A19B}"
7 RootNamespace="boolean" 7 RootNamespace="boolean"
8 Keyword="Win32Proj"
8 TargetFrameworkVersion="0" 9 TargetFrameworkVersion="0"
9 > 10 >
10 <Platforms> 11 <Platforms>
@@ -20,11 +21,9 @@
20 <Configurations> 21 <Configurations>
21 <Configuration 22 <Configuration
22 Name="Debug|Win32" 23 Name="Debug|Win32"
23 OutputDirectory="$(SolutionDir)libs\" 24 OutputDirectory="$(SolutionDir)bin\"
24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 25 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
25 ConfigurationType="4" 26 ConfigurationType="2"
26 UseOfMFC="0"
27 ATLMinimizesCRunTimeLibraryUsage="false"
28 CharacterSet="2" 27 CharacterSet="2"
29 > 28 >
30 <Tool 29 <Tool
@@ -36,7 +35,6 @@
36 <Tool 35 <Tool
37 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
38 /> 37 />
39
40 <Tool 38 <Tool
41 Name="VCMIDLTool" 39 Name="VCMIDLTool"
42 /> 40 />
@@ -44,41 +42,47 @@
44 Name="VCCLCompilerTool" 42 Name="VCCLCompilerTool"
45 AdditionalOptions="" 43 AdditionalOptions=""
46 Optimization="0" 44 Optimization="0"
47 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes;../../../localization/includes" 45 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl"
48 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 46 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS"
47 MinimalRebuild="true"
49 BasicRuntimeChecks="0" 48 BasicRuntimeChecks="0"
50 RuntimeLibrary="3" 49 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 50 UsePrecompiledHeader="0"
52 PrecompiledHeaderFile=""
53 AssemblerListingLocation="$(ConfigurationName)/"
54 ObjectFile="$(ConfigurationName)/"
55 ProgramDataBaseFileName="$(ConfigurationName)/"
56 WarningLevel="3" 51 WarningLevel="3"
57 SuppressStartupBanner="true"
58
59 DebugInformationFormat="3" 52 DebugInformationFormat="3"
60 CompileAs="0"
61 /> 53 />
62 <Tool 54 <Tool
63 Name="VCManagedResourceCompilerTool" 55 Name="VCManagedResourceCompilerTool"
64 /> 56 />
65 <Tool 57 <Tool
66 Name="VCResourceCompilerTool" 58 Name="VCResourceCompilerTool"
67 PreprocessorDefinitions="_DEBUG"
68 Culture="1036"
69 /> 59 />
70 <Tool 60 <Tool
71 Name="VCPreLinkEventTool" 61 Name="VCPreLinkEventTool"
62 Description="Make dependencies"
63 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean.dll %%f &gt;nul&#x0D;&#x0A;copy *.def booleantmp.def &gt;nul&#x0D;&#x0A;copy ..\boolean_header.def+booleantmp.def ..\boolean_export.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;&#x0D;&#x0A;"
72 /> 64 />
73 <Tool 65 <Tool
74 Name="VCLibrarianTool" 66 Name="VCLinkerTool"
75 OutputFile="../../../../libs/boolean.lib" 67 AdditionalDependencies="LibScilab.lib boolean_f.lib"
76 SuppressStartupBanner="true" 68 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
69 LinkIncremental="1"
70 ModuleDefinitionFile="boolean_Export.def"
71 GenerateDebugInformation="true"
72 SubSystem="2"
73 RandomizedBaseAddress="1"
74 DataExecutionPrevention="0"
75 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
76 TargetMachine="1"
77 CLRUnmanagedCodeCheck="true"
77 /> 78 />
78 <Tool 79 <Tool
79 Name="VCALinkTool" 80 Name="VCALinkTool"
80 /> 81 />
81 <Tool 82 <Tool
83 Name="VCManifestTool"
84 />
85 <Tool
82 Name="VCXDCMakeTool" 86 Name="VCXDCMakeTool"
83 /> 87 />
84 <Tool 88 <Tool
@@ -88,17 +92,17 @@
88 Name="VCFxCopTool" 92 Name="VCFxCopTool"
89 /> 93 />
90 <Tool 94 <Tool
95 Name="VCAppVerifierTool"
96 />
97 <Tool
91 Name="VCPostBuildEventTool" 98 Name="VCPostBuildEventTool"
92 CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean.def &gt;nul&#x0D;&#x0A;copy boolean.def ..\..\..\..\..\libs\boolean.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
93 /> 99 />
94 </Configuration> 100 </Configuration>
95 <Configuration 101 <Configuration
96 Name="Debug|x64" 102 Name="Debug|x64"
97 OutputDirectory="$(SolutionDir)libs\" 103 OutputDirectory="$(SolutionDir)bin\"
98 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 104 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
99 ConfigurationType="4" 105 ConfigurationType="2"
100 UseOfMFC="0"
101 ATLMinimizesCRunTimeLibraryUsage="false"
102 CharacterSet="2" 106 CharacterSet="2"
103 > 107 >
104 <Tool 108 <Tool
@@ -110,7 +114,6 @@
110 <Tool 114 <Tool
111 Name="VCXMLDataGeneratorTool" 115 Name="VCXMLDataGeneratorTool"
112 /> 116 />
113
114 <Tool 117 <Tool
115 Name="VCMIDLTool" 118 Name="VCMIDLTool"
116 TargetEnvironment="3" 119 TargetEnvironment="3"
@@ -118,41 +121,47 @@
118 <Tool 121 <Tool
119 Name="VCCLCompilerTool" 122 Name="VCCLCompilerTool"
120 Optimization="0" 123 Optimization="0"
121 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes;../../../localization/includes" 124 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl"
122 PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE" 125 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS"
126 MinimalRebuild="true"
123 BasicRuntimeChecks="0" 127 BasicRuntimeChecks="0"
124 RuntimeLibrary="3" 128 RuntimeLibrary="3"
125 UsePrecompiledHeader="0" 129 UsePrecompiledHeader="0"
126 PrecompiledHeaderFile=""
127 AssemblerListingLocation="$(ConfigurationName)/"
128 ObjectFile="$(ConfigurationName)/"
129 ProgramDataBaseFileName="$(ConfigurationName)/"
130 WarningLevel="3" 130 WarningLevel="3"
131 SuppressStartupBanner="true"
132
133 DebugInformationFormat="3" 131 DebugInformationFormat="3"
134 CompileAs="0"
135 /> 132 />
136 <Tool 133 <Tool
137 Name="VCManagedResourceCompilerTool" 134 Name="VCManagedResourceCompilerTool"
138 /> 135 />
139 <Tool 136 <Tool
140 Name="VCResourceCompilerTool" 137 Name="VCResourceCompilerTool"
141 PreprocessorDefinitions="_DEBUG"
142 Culture="1036"
143 /> 138 />
144 <Tool 139 <Tool
145 Name="VCPreLinkEventTool" 140 Name="VCPreLinkEventTool"
141 Description="Make dependencies"
142 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean.dll %%f &gt;nul&#x0D;&#x0A;copy *.def booleantmp.def &gt;nul&#x0D;&#x0A;copy ..\boolean_header.def+booleantmp.def ..\boolean_export.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;&#x0D;&#x0A;"
146 /> 143 />
147 <Tool 144 <Tool
148 Name="VCLibrarianTool" 145 Name="VCLinkerTool"
149 OutputFile="../../../../libs/boolean.lib" 146 AdditionalDependencies="LibScilab.lib boolean_f.lib"
150 SuppressStartupBanner="true" 147 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
148 LinkIncremental="1"
149 ModuleDefinitionFile="boolean_Export.def"
150 GenerateDebugInformation="true"
151 SubSystem="2"
152 RandomizedBaseAddress="1"
153 DataExecutionPrevention="0"
154 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
155 TargetMachine="17"
156 CLRUnmanagedCodeCheck="true"
151 /> 157 />
152 <Tool 158 <Tool
153 Name="VCALinkTool" 159 Name="VCALinkTool"
154 /> 160 />
155 <Tool 161 <Tool
162 Name="VCManifestTool"
163 />
164 <Tool
156 Name="VCXDCMakeTool" 165 Name="VCXDCMakeTool"
157 /> 166 />
158 <Tool 167 <Tool
@@ -162,18 +171,19 @@
162 Name="VCFxCopTool" 171 Name="VCFxCopTool"
163 /> 172 />
164 <Tool 173 <Tool
174 Name="VCAppVerifierTool"
175 />
176 <Tool
165 Name="VCPostBuildEventTool" 177 Name="VCPostBuildEventTool"
166 CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean.def &gt;nul&#x0D;&#x0A;copy boolean.def ..\..\..\..\..\libs\boolean.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
167 /> 178 />
168 </Configuration> 179 </Configuration>
169 <Configuration 180 <Configuration
170 Name="Release|Win32" 181 Name="Release|Win32"
171 OutputDirectory="$(SolutionDir)libs\" 182 OutputDirectory="$(SolutionDir)bin\"
172 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 183 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
173 ConfigurationType="4" 184 ConfigurationType="2"
174 UseOfMFC="0"
175 ATLMinimizesCRunTimeLibraryUsage="false"
176 CharacterSet="2" 185 CharacterSet="2"
186 WholeProgramOptimization="0"
177 > 187 >
178 <Tool 188 <Tool
179 Name="VCPreBuildEventTool" 189 Name="VCPreBuildEventTool"
@@ -184,50 +194,57 @@
184 <Tool 194 <Tool
185 Name="VCXMLDataGeneratorTool" 195 Name="VCXMLDataGeneratorTool"
186 /> 196 />
187
188 <Tool 197 <Tool
189 Name="VCMIDLTool" 198 Name="VCMIDLTool"
190 /> 199 />
191 <Tool 200 <Tool
192 Name="VCCLCompilerTool" 201 Name="VCCLCompilerTool"
193 AdditionalOptions="" 202 AdditionalOptions=""
194 Optimization="2"
195 InlineFunctionExpansion="1" 203 InlineFunctionExpansion="1"
196 FavorSizeOrSpeed="1" 204 FavorSizeOrSpeed="1"
197 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes;../../../localization/includes" 205 WholeProgramOptimization="false"
198 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" 206 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl"
207 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS"
199 StringPooling="true" 208 StringPooling="true"
200 RuntimeLibrary="2" 209 RuntimeLibrary="0"
201 EnableFunctionLevelLinking="true"
202 EnableEnhancedInstructionSet="0" 210 EnableEnhancedInstructionSet="0"
203 UsePrecompiledHeader="0" 211 UsePrecompiledHeader="0"
204 PrecompiledHeaderFile=""
205 AssemblerListingLocation="$(ConfigurationName)/"
206 ObjectFile="$(ConfigurationName)/"
207 ProgramDataBaseFileName="$(ConfigurationName)/"
208 WarningLevel="3" 212 WarningLevel="3"
209 SuppressStartupBanner="true" 213 DebugInformationFormat="3"
210
211 CompileAs="0"
212 /> 214 />
213 <Tool 215 <Tool
214 Name="VCManagedResourceCompilerTool" 216 Name="VCManagedResourceCompilerTool"
215 /> 217 />
216 <Tool 218 <Tool
217 Name="VCResourceCompilerTool" 219 Name="VCResourceCompilerTool"
218 PreprocessorDefinitions="NDEBUG"
219 Culture="1036"
220 /> 220 />
221 <Tool 221 <Tool
222 Name="VCPreLinkEventTool" 222 Name="VCPreLinkEventTool"
223 Description="Make dependencies"
224 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean.dll %%f &gt;nul&#x0D;&#x0A;copy *.def booleantmp.def &gt;nul&#x0D;&#x0A;copy ..\boolean_header.def+booleantmp.def ..\boolean_export.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;&#x0D;&#x0A;"
225 />
226 <Tool
227 Name="VCLinkerTool"
228 AdditionalDependencies="LibScilab.lib boolean_f.lib"
229 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
230 LinkIncremental="1"
231 ModuleDefinitionFile="boolean_Export.def"
232 GenerateDebugInformation="false"
233 SubSystem="2"
234 OptimizeReferences="2"
235 EnableCOMDATFolding="2"
236 LinkTimeCodeGeneration="0"
237 RandomizedBaseAddress="1"
238 DataExecutionPrevention="0"
239 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
240 TargetMachine="1"
241 CLRUnmanagedCodeCheck="true"
223 /> 242 />
224 <Tool 243 <Tool
225 Name="VCLibrarianTool" 244 Name="VCALinkTool"
226 OutputFile="../../../../libs/boolean.lib"
227 SuppressStartupBanner="true"
228 /> 245 />
229 <Tool 246 <Tool
230 Name="VCALinkTool" 247 Name="VCManifestTool"
231 /> 248 />
232 <Tool 249 <Tool
233 Name="VCXDCMakeTool" 250 Name="VCXDCMakeTool"
@@ -239,18 +256,19 @@
239 Name="VCFxCopTool" 256 Name="VCFxCopTool"
240 /> 257 />
241 <Tool 258 <Tool
259 Name="VCAppVerifierTool"
260 />
261 <Tool
242 Name="VCPostBuildEventTool" 262 Name="VCPostBuildEventTool"
243 CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean.def &gt;nul&#x0D;&#x0A;copy boolean.def ..\..\..\..\..\libs\boolean.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
244 /> 263 />
245 </Configuration> 264 </Configuration>
246 <Configuration 265 <Configuration
247 Name="Release|x64" 266 Name="Release|x64"
248 OutputDirectory="$(SolutionDir)libs\" 267 OutputDirectory="$(SolutionDir)bin\"
249 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 268 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
250 ConfigurationType="4" 269 ConfigurationType="2"
251 UseOfMFC="0"
252 ATLMinimizesCRunTimeLibraryUsage="false"
253 CharacterSet="2" 270 CharacterSet="2"
271 WholeProgramOptimization="0"
254 > 272 >
255 <Tool 273 <Tool
256 Name="VCPreBuildEventTool" 274 Name="VCPreBuildEventTool"
@@ -261,50 +279,57 @@
261 <Tool 279 <Tool
262 Name="VCXMLDataGeneratorTool" 280 Name="VCXMLDataGeneratorTool"
263 /> 281 />
264
265 <Tool 282 <Tool
266 Name="VCMIDLTool" 283 Name="VCMIDLTool"
267 TargetEnvironment="3" 284 TargetEnvironment="3"
268 /> 285 />
269 <Tool 286 <Tool
270 Name="VCCLCompilerTool" 287 Name="VCCLCompilerTool"
271 Optimization="2"
272 InlineFunctionExpansion="1" 288 InlineFunctionExpansion="1"
273 FavorSizeOrSpeed="1" 289 FavorSizeOrSpeed="1"
274 AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../api_scilab/includes;../../../localization/includes" 290 WholeProgramOptimization="false"
275 PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE" 291 AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../api_scilab/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../windows_tools/includes;../../../../libs/intl"
292 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_EXPORTS"
276 StringPooling="true" 293 StringPooling="true"
277 RuntimeLibrary="2" 294 RuntimeLibrary="0"
278 EnableFunctionLevelLinking="true"
279 EnableEnhancedInstructionSet="0" 295 EnableEnhancedInstructionSet="0"
280 UsePrecompiledHeader="0" 296 UsePrecompiledHeader="0"
281 PrecompiledHeaderFile=""
282 AssemblerListingLocation="$(ConfigurationName)/"
283 ObjectFile="$(ConfigurationName)/"
284 ProgramDataBaseFileName="$(ConfigurationName)/"
285 WarningLevel="3" 297 WarningLevel="3"
286 SuppressStartupBanner="true" 298 DebugInformationFormat="3"
287
288 CompileAs="0"
289 /> 299 />
290 <Tool 300 <Tool
291 Name="VCManagedResourceCompilerTool" 301 Name="VCManagedResourceCompilerTool"
292 /> 302 />
293 <Tool 303 <Tool
294 Name="VCResourceCompilerTool" 304 Name="VCResourceCompilerTool"
295 PreprocessorDefinitions="NDEBUG"
296 Culture="1036"
297 /> 305 />
298 <Tool 306 <Tool
299 Name="VCPreLinkEventTool" 307 Name="VCPreLinkEventTool"
308 Description="Make dependencies"
309 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean_f.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean.dll %%f &gt;nul&#x0D;&#x0A;copy *.def booleantmp.def &gt;nul&#x0D;&#x0A;copy ..\boolean_header.def+booleantmp.def ..\boolean_export.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;&#x0D;&#x0A;"
310 />
311 <Tool
312 Name="VCLinkerTool"
313 AdditionalDependencies="LibScilab.lib boolean_f.lib"
314 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
315 LinkIncremental="1"
316 ModuleDefinitionFile="boolean_Export.def"
317 GenerateDebugInformation="false"
318 SubSystem="2"
319 OptimizeReferences="2"
320 EnableCOMDATFolding="2"
321 LinkTimeCodeGeneration="0"
322 RandomizedBaseAddress="1"
323 DataExecutionPrevention="0"
324 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
325 TargetMachine="17"
326 CLRUnmanagedCodeCheck="true"
300 /> 327 />
301 <Tool 328 <Tool
302 Name="VCLibrarianTool" 329 Name="VCALinkTool"
303 OutputFile="../../../../libs/boolean.lib"
304 SuppressStartupBanner="true"
305 /> 330 />
306 <Tool 331 <Tool
307 Name="VCALinkTool" 332 Name="VCManifestTool"
308 /> 333 />
309 <Tool 334 <Tool
310 Name="VCXDCMakeTool" 335 Name="VCXDCMakeTool"
@@ -316,8 +341,10 @@
316 Name="VCFxCopTool" 341 Name="VCFxCopTool"
317 /> 342 />
318 <Tool 343 <Tool
344 Name="VCAppVerifierTool"
345 />
346 <Tool
319 Name="VCPostBuildEventTool" 347 Name="VCPostBuildEventTool"
320 CommandLine="cd &quot;$(IntDir)&quot; &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n libscilab.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean.def &gt;nul&#x0D;&#x0A;copy boolean.def ..\..\..\..\..\libs\boolean.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
321 /> 348 />
322 </Configuration> 349 </Configuration>
323 </Configurations> 350 </Configurations>
@@ -329,6 +356,10 @@
329 Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" 356 Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
330 > 357 >
331 <File 358 <File
359 RelativePath=".\DllmainBoolean.c"
360 >
361 </File>
362 <File
332 RelativePath="..\..\sci_gateway\c\gw_boolean.c" 363 RelativePath="..\..\sci_gateway\c\gw_boolean.c"
333 > 364 >
334 </File> 365 </File>
@@ -366,11 +397,11 @@
366 Filter="h;hpp;hxx;hm;inl" 397 Filter="h;hpp;hxx;hm;inl"
367 > 398 >
368 <File 399 <File
369 RelativePath="..\..\includes\gw_boolean.h" 400 RelativePath=".\vect_and.h"
370 > 401 >
371 </File> 402 </File>
372 <File 403 <File
373 RelativePath="..\..\includes\matboolean.h" 404 RelativePath=".\vect_or.h"
374 > 405 >
375 </File> 406 </File>
376 </Filter> 407 </Filter>
@@ -385,20 +416,32 @@
385 <Filter 416 <Filter
386 Name="Libraries Dependencies" 417 Name="Libraries Dependencies"
387 > 418 >
419 <Filter
420 Name="Imports"
421 >
422 <File
423 RelativePath=".\boolean_f_Import.def"
424 >
425 </File>
426 <File
427 RelativePath=".\LibScilab_Import.def"
428 >
429 </File>
430 </Filter>
388 </Filter> 431 </Filter>
389 <Filter 432 <Filter
390 Name="Resource Files" 433 Name="Resource Files"
391 > 434 >
435 <File
436 RelativePath=".\boolean.rc"
437 >
438 </File>
392 </Filter> 439 </Filter>
393 <File 440 <File
394 RelativePath="..\..\boolean.iss" 441 RelativePath="..\..\boolean.iss"
395 > 442 >
396 </File> 443 </File>
397 <File 444 <File
398 RelativePath="..\..\sci_gateway\boolean_gateway.xml"
399 >
400 </File>
401 <File
402 RelativePath="..\..\Makefile.am" 445 RelativePath="..\..\Makefile.am"
403 > 446 >
404 </File> 447 </File>
diff --git a/scilab/modules/boolean/src/c/boolean_f_Import.def b/scilab/modules/boolean/src/c/boolean_f_Import.def
new file mode 100644
index 0000000..5afb68a
--- /dev/null
+++ b/scilab/modules/boolean/src/c/boolean_f_Import.def
@@ -0,0 +1,9 @@
1 LIBRARY boolean_f.dll
2
3
4EXPORTS
5;
6;boolean_f
7;
8intsbool2s_
9intfind_
diff --git a/scilab/modules/boolean/src/c/boolean_header.def b/scilab/modules/boolean/src/c/boolean_header.def
new file mode 100644
index 0000000..131f3c4
--- /dev/null
+++ b/scilab/modules/boolean/src/c/boolean_header.def
@@ -0,0 +1,8 @@
1LIBRARY boolean.dll
2
3
4EXPORTS
5; ---------------------------------------
6; boolean
7; ---------------------------------------
8
diff --git a/scilab/modules/boolean/src/fortran/LibScilab_Import.def b/scilab/modules/boolean/src/fortran/LibScilab_Import.def
new file mode 100644
index 0000000..7c92c11
--- /dev/null
+++ b/scilab/modules/boolean/src/fortran/LibScilab_Import.def
@@ -0,0 +1,30 @@
1 LIBRARY Libscilab.dll
2
3
4EXPORTS
5;
6;core
7;
8putfunnam_
9isany_
10iop_
11recu_
12stack_
13com_
14vstk_
15cha1_
16gettype_
17errgst_
18getrmat_
19indxgc_
20intersci_
21adre_
22indxg_
23imcopy_
24unsfdcopy_
25dsort_
26setref_
27;
28dset_
29iset_
30
diff --git a/scilab/modules/boolean/src/fortran/boolean_Import.def b/scilab/modules/boolean/src/fortran/boolean_Import.def
new file mode 100644
index 0000000..4711867
--- /dev/null
+++ b/scilab/modules/boolean/src/fortran/boolean_Import.def
@@ -0,0 +1,4 @@
1LIBRARY boolean.dll
2
3
4EXPORTS
diff --git a/scilab/modules/boolean/src/fortran/boolean_f.rc b/scilab/modules/boolean/src/fortran/boolean_f.rc
new file mode 100644
index 0000000..766c6a2
--- /dev/null
+++ b/scilab/modules/boolean/src/fortran/boolean_f.rc
@@ -0,0 +1,96 @@
1// Microsoft Visual C++ generated resource script.
2//
3
4
5#define APSTUDIO_READONLY_SYMBOLS
6/////////////////////////////////////////////////////////////////////////////
7//
8// Generated from the TEXTINCLUDE 2 resource.
9//
10//#include "afxres.h"
11#define APSTUDIO_HIDDEN_SYMBOLS
12#include "windows.h"
13/////////////////////////////////////////////////////////////////////////////
14#undef APSTUDIO_READONLY_SYMBOLS
15
16/////////////////////////////////////////////////////////////////////////////
17// French (France) resources
18
19#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
20#ifdef _WIN32
21LANGUAGE LANG_FRENCH, SUBLANG_FRENCH
22#pragma code_page(1252)
23#endif //_WIN32
24
25#ifdef APSTUDIO_INVOKED
26/////////////////////////////////////////////////////////////////////////////
27//
28// TEXTINCLUDE
29//
30
311 TEXTINCLUDE
32BEGIN
33 "resource.h\0"
34END
35
363 TEXTINCLUDE
37BEGIN
38 "\r\n"
39 "\0"
40END
41
42#endif // APSTUDIO_INVOKED
43
44
45/////////////////////////////////////////////////////////////////////////////
46//
47// Version
48//
49
50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,0,0
52 PRODUCTVERSION 5,3,0,0
53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG
55 FILEFLAGS 0x1L
56#else
57 FILEFLAGS 0x0L
58#endif
59 FILEOS 0x4L
60 FILETYPE 0x2L
61 FILESUBTYPE 0x0L
62BEGIN
63 BLOCK "StringFileInfo"
64 BEGIN
65 BLOCK "040c04b0"
66 BEGIN
67 VALUE "FileDescription", "boolean_f module"
68 VALUE "FileVersion", "5, 3, 0, 0"
69 VALUE "InternalName", "boolean_f module"
70 VALUE "LegalCopyright", "Copyright (C) 2010"
71 VALUE "OriginalFilename", "boolean_f.dll"
72 VALUE "ProductName", "boolean_f module"
73 VALUE "ProductVersion", "5, 3, 0, 0"
74 END
75 END
76 BLOCK "VarFileInfo"
77 BEGIN
78 VALUE "Translation", 0x40c, 1200
79 END
80END
81
82#endif // French (France) resources
83/////////////////////////////////////////////////////////////////////////////
84
85
86
87#ifndef APSTUDIO_INVOKED
88/////////////////////////////////////////////////////////////////////////////
89//
90// Generated from the TEXTINCLUDE 3 resource.
91//
92
93
94/////////////////////////////////////////////////////////////////////////////
95#endif // not APSTUDIO_INVOKED
96
diff --git a/scilab/modules/boolean/src/fortran/boolean_f.vfproj b/scilab/modules/boolean/src/fortran/boolean_f.vfproj
index da7eb66..2256afa 100644
--- a/scilab/modules/boolean/src/fortran/boolean_f.vfproj
+++ b/scilab/modules/boolean/src/fortran/boolean_f.vfproj
@@ -1,80 +1,90 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject ProjectType="typeStaticLibrary" ProjectCreator="Intel Fortran" Keyword="Static Library" Version="11.0" ProjectIdGuid="{45ECEB36-A12B-42F5-9D7A-216A0E70601D}"> 2<VisualStudioProject ProjectType="typeDynamicLibrary" ProjectCreator="Intel Fortran" Keyword="Dll" Version="11.0" ProjectIdGuid="{45ECEB36-A12B-42F5-9D7A-216A0E70601D}">
3 <Platforms> 3 <Platforms>
4 <Platform Name="Win32"/> 4 <Platform Name="Win32"/>
5 <Platform Name="x64"/></Platforms> 5 <Platform Name="x64"/></Platforms>
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true"/> 8 <Tool Name="VFFortranCompilerTool" 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="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="boolean_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\boolean_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
12 <Tool Name="VFCustomBuildTool"/> 12 <Tool Name="VFCustomBuildTool"/>
13 <Tool Name="VFPreLinkEventTool"/> 13 <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
14 <Tool Name="VFPreBuildEventTool"/> 14for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul
15 <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
16for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
17copy *.def boolean_f.def &gt;nul 15copy *.def boolean_f.def &gt;nul
18copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul 16copy boolean_f.def ..\boolean_f.vcdef &gt;nul
19del *.def &gt;nul 17del *.def &gt;nul
20cd .."/> 18cd ..
19copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul" Description="Build boolean.def"/>
20 <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
21lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
22 <Tool Name="VFPostBuildEventTool"/>
21 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 23 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
22 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 24 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
23 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 25 <Tool Name="VFFortranCompilerTool" 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="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 26 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="boolean_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\boolean_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib"/>
25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 27 <Tool Name="VFResourceCompilerTool"/>
27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 28 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
28 <Tool Name="VFCustomBuildTool"/> 29 <Tool Name="VFCustomBuildTool"/>
29 <Tool Name="VFPreLinkEventTool"/> 30 <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
30 <Tool Name="VFPreBuildEventTool"/> 31for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul
31 <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
32for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
33copy *.def boolean_f.def &gt;nul 32copy *.def boolean_f.def &gt;nul
34copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul 33copy boolean_f.def ..\boolean_f.vcdef &gt;nul
35del *.def &gt;nul 34del *.def &gt;nul
36cd .."/> 35cd ..
36copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul" Description="Build boolean.def"/>
37 <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
38lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
39 <Tool Name="VFPostBuildEventTool"/>
37 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 40 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
38 <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 41 <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
39 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL" DisableDefaultLibSearch="true"/> 42 <Tool Name="VFFortranCompilerTool" 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"/>
40 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/> 43 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="boolean_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\boolean_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib"/>
41 <Tool Name="VFResourceCompilerTool"/> 44 <Tool Name="VFResourceCompilerTool"/>
42 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 45 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
43 <Tool Name="VFCustomBuildTool"/> 46 <Tool Name="VFCustomBuildTool"/>
44 <Tool Name="VFPreLinkEventTool"/> 47 <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
45 <Tool Name="VFPreBuildEventTool"/> 48for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul
46 <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
47for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
48copy *.def boolean_f.def &gt;nul 49copy *.def boolean_f.def &gt;nul
49copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul 50copy boolean_f.def ..\boolean_f.vcdef &gt;nul
50del *.def &gt;nul 51del *.def &gt;nul
51cd .."/> 52cd ..
53copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul" Description="Build boolean.def"/>
54 <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
55lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
56 <Tool Name="VFPostBuildEventTool"/>
52 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 57 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
53 <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 58 <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
54 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 59 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
55 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 60 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="boolean_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\boolean_f.lib" LinkDLL="true" AdditionalDependencies="Libscilab.lib"/>
56 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/boolean_f.lib"/>
57 <Tool Name="VFResourceCompilerTool"/> 61 <Tool Name="VFResourceCompilerTool"/>
58 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 62 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
59 <Tool Name="VFCustomBuildTool"/> 63 <Tool Name="VFCustomBuildTool"/>
60 <Tool Name="VFPreLinkEventTool"/> 64 <Tool Name="VFPreLinkEventTool" CommandLine="cd $(IntDir)
61 <Tool Name="VFPreBuildEventTool"/> 65for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul
62 <Tool Name="VFPostBuildEventTool" CommandLine="cd $(IntDir)
63for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul
64copy *.def boolean_f.def &gt;nul 66copy *.def boolean_f.def &gt;nul
65copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul 67copy boolean_f.def ..\boolean_f.vcdef &gt;nul
66del *.def &gt;nul 68del *.def &gt;nul
67cd .."/> 69cd ..
70copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul" Description="Build boolean.def"/>
71 <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL
72lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
73 <Tool Name="VFPostBuildEventTool"/>
68 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations> 74 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
69 <Files> 75 <Files>
70 <Filter Name="Header Files" Filter="fi;fd"/> 76 <Filter Name="Header Files" Filter="fi;fd"/>
71 <Filter Name="Library dependencies"/> 77 <Filter Name="Library Dependencies">
72 <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"/> 78 <File RelativePath=".\boolean_Import.def"/>
79 <File RelativePath=".\LibScilab_Import.def"/></Filter>
80 <Filter Name="Resource Files" Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
81 <File RelativePath=".\boolean_f.rc"/></Filter>
73 <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl"> 82 <Filter Name="Source Files" Filter="f90;for;f;fpp;ftn;def;odl;idl">
74 <File RelativePath="find.f"/> 83 <File RelativePath=".\find.f"/>
75 <File RelativePath="logic.f"/> 84 <File RelativePath=".\logic.f"/>
76 <File RelativePath="..\..\sci_gateway\fortran\sci_bool2s.f"/> 85 <File RelativePath="..\..\sci_gateway\fortran\sci_bool2s.f"/>
77 <File RelativePath="..\..\sci_gateway\fortran\sci_find.f"/></Filter> 86 <File RelativePath="..\..\sci_gateway\fortran\sci_find.f"/></Filter>
78 <File RelativePath="..\..\sci_gateway\boolean_gateway.xml"/> 87 <File RelativePath="..\..\..\..\bin\blasplus.lib"/>
88 <File RelativePath="..\..\..\..\bin\lapack.lib"/>
79 <File RelativePath="..\..\Makefile.am"/></Files> 89 <File RelativePath="..\..\Makefile.am"/></Files>
80 <Globals/></VisualStudioProject> 90 <Globals/></VisualStudioProject>
diff --git a/scilab/modules/boolean/src/fortran/boolean_f2c.vcproj b/scilab/modules/boolean/src/fortran/boolean_f2c.vcproj
index 6e4a6ef..cb5b00b 100644
--- a/scilab/modules/boolean/src/fortran/boolean_f2c.vcproj
+++ b/scilab/modules/boolean/src/fortran/boolean_f2c.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -24,10 +24,10 @@
24 <Configurations> 24 <Configurations>
25 <Configuration 25 <Configuration
26 Name="Debug|Win32" 26 Name="Debug|Win32"
27 OutputDirectory="$(SolutionDir)libs\" 27 OutputDirectory="$(SolutionDir)bin\"
28 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 28 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
29 ConfigurationType="4" 29 ConfigurationType="2"
30 CharacterSet="2" 30 CharacterSet="1"
31 > 31 >
32 <Tool 32 <Tool
33 Name="f2c rule" 33 Name="f2c rule"
@@ -35,15 +35,14 @@
35 /> 35 />
36 <Tool 36 <Tool
37 Name="VCPreBuildEventTool" 37 Name="VCPreBuildEventTool"
38 Description="Build Dependencies"
39 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
38 ExecutionBucket="2" 40 ExecutionBucket="2"
39 /> 41 />
40 <Tool 42 <Tool
41 Name="VCCustomBuildTool" 43 Name="VCCustomBuildTool"
42 /> 44 />
43 <Tool 45
44 Name="VCWebServiceProxyGeneratorTool"
45 ExecutionBucket="4"
46 />
47 <Tool 46 <Tool
48 Name="VCXMLDataGeneratorTool" 47 Name="VCXMLDataGeneratorTool"
49 /> 48 />
@@ -56,14 +55,14 @@
56 ExecutionBucket="6" 55 ExecutionBucket="6"
57 Optimization="0" 56 Optimization="0"
58 AdditionalIncludeDirectories="../../../../libs/f2c" 57 AdditionalIncludeDirectories="../../../../libs/f2c"
59 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" 58 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_F2C_EXPORTS;FORDLL"
60 MinimalRebuild="true" 59 MinimalRebuild="true"
61 BasicRuntimeChecks="0" 60 BasicRuntimeChecks="0"
62 RuntimeLibrary="3" 61 RuntimeLibrary="3"
63 UsePrecompiledHeader="0" 62 UsePrecompiledHeader="0"
64 WarningLevel="3" 63 WarningLevel="3"
65
66 DebugInformationFormat="3" 64 DebugInformationFormat="3"
65 CompileAs="1"
67 /> 66 />
68 <Tool 67 <Tool
69 Name="VCManagedResourceCompilerTool" 68 Name="VCManagedResourceCompilerTool"
@@ -75,45 +74,63 @@
75 /> 74 />
76 <Tool 75 <Tool
77 Name="VCPreLinkEventTool" 76 Name="VCPreLinkEventTool"
77 Description="Build boolean_f.def"
78 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul&#x0D;&#x0A;"
78 ExecutionBucket="9" 79 ExecutionBucket="9"
79 /> 80 />
80 <Tool 81 <Tool
81 Name="VCLibrarianTool" 82 Name="VCLinkerTool"
82 ExecutionBucket="10" 83 ExecutionBucket="10"
83 OutputFile="../../../../libs/boolean_f.lib" 84 AdditionalDependencies="Libscilab.lib boolean.lib"
85 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
86 LinkIncremental="2"
87 ModuleDefinitionFile="boolean_f.def"
88 GenerateDebugInformation="true"
89 SubSystem="2"
90 RandomizedBaseAddress="1"
91 DataExecutionPrevention="0"
92 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
93 TargetMachine="1"
84 /> 94 />
85 <Tool 95 <Tool
86 Name="VCALinkTool" 96 Name="VCALinkTool"
87 ExecutionBucket="11" 97 ExecutionBucket="11"
88 /> 98 />
89 <Tool 99 <Tool
90 Name="VCXDCMakeTool" 100 Name="VCManifestTool"
91 ExecutionBucket="12" 101 ExecutionBucket="12"
92 /> 102 />
93 <Tool 103 <Tool
94 Name="VCBscMakeTool" 104 Name="VCXDCMakeTool"
95 ExecutionBucket="13" 105 ExecutionBucket="13"
96 /> 106 />
97 <Tool 107 <Tool
98 Name="VCFxCopTool" 108 Name="VCBscMakeTool"
99 ExecutionBucket="14" 109 ExecutionBucket="14"
100 /> 110 />
101 <Tool 111 <Tool
102 Name="VCPostBuildEventTool" 112 Name="VCFxCopTool"
103 Description="Build Scicos_f.def"
104 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
105 ExecutionBucket="15" 113 ExecutionBucket="15"
106 /> 114 />
115 <Tool
116 Name="VCPostBuildEventTool"
117 ExecutionBucket="17"
118 />
119 <Tool
120 Name="VCAppVerifierTool"
121 />
107 </Configuration> 122 </Configuration>
108 <Configuration 123 <Configuration
109 Name="Debug|x64" 124 Name="Debug|x64"
110 OutputDirectory="$(SolutionDir)libs\" 125 OutputDirectory="$(SolutionDir)bin\"
111 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 126 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
112 ConfigurationType="4" 127 ConfigurationType="2"
113 CharacterSet="2" 128 CharacterSet="1"
114 > 129 >
115 <Tool 130 <Tool
116 Name="VCPreBuildEventTool" 131 Name="VCPreBuildEventTool"
132 Description="Build Dependencies"
133 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
117 /> 134 />
118 <Tool 135 <Tool
119 Name="VCCustomBuildTool" 136 Name="VCCustomBuildTool"
@@ -124,7 +141,6 @@
124 <Tool 141 <Tool
125 Name="VCXMLDataGeneratorTool" 142 Name="VCXMLDataGeneratorTool"
126 /> 143 />
127
128 <Tool 144 <Tool
129 Name="VCMIDLTool" 145 Name="VCMIDLTool"
130 TargetEnvironment="3" 146 TargetEnvironment="3"
@@ -133,14 +149,14 @@
133 Name="VCCLCompilerTool" 149 Name="VCCLCompilerTool"
134 Optimization="0" 150 Optimization="0"
135 AdditionalIncludeDirectories="../../../../libs/f2c" 151 AdditionalIncludeDirectories="../../../../libs/f2c"
136 PreprocessorDefinitions="WIN32;_DEBUG;_LIB" 152 PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BOOLEAN_F2C_EXPORTS;FORDLL"
137 MinimalRebuild="true" 153 MinimalRebuild="true"
138 BasicRuntimeChecks="0" 154 BasicRuntimeChecks="0"
139 RuntimeLibrary="3" 155 RuntimeLibrary="3"
140 UsePrecompiledHeader="0" 156 UsePrecompiledHeader="0"
141 WarningLevel="3" 157 WarningLevel="3"
142
143 DebugInformationFormat="3" 158 DebugInformationFormat="3"
159 CompileAs="1"
144 /> 160 />
145 <Tool 161 <Tool
146 Name="VCManagedResourceCompilerTool" 162 Name="VCManagedResourceCompilerTool"
@@ -150,15 +166,29 @@
150 /> 166 />
151 <Tool 167 <Tool
152 Name="VCPreLinkEventTool" 168 Name="VCPreLinkEventTool"
169 Description="Build boolean_f.def"
170 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul&#x0D;&#x0A;"
153 /> 171 />
154 <Tool 172 <Tool
155 Name="VCLibrarianTool" 173 Name="VCLinkerTool"
156 OutputFile="../../../../libs/boolean_f.lib" 174 AdditionalDependencies="Libscilab.lib boolean.lib"
175 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
176 LinkIncremental="2"
177 ModuleDefinitionFile="boolean_f.def"
178 GenerateDebugInformation="true"
179 SubSystem="2"
180 RandomizedBaseAddress="1"
181 DataExecutionPrevention="0"
182 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
183 TargetMachine="17"
157 /> 184 />
158 <Tool 185 <Tool
159 Name="VCALinkTool" 186 Name="VCALinkTool"
160 /> 187 />
161 <Tool 188 <Tool
189 Name="VCManifestTool"
190 />
191 <Tool
162 Name="VCXDCMakeTool" 192 Name="VCXDCMakeTool"
163 /> 193 />
164 <Tool 194 <Tool
@@ -168,103 +198,109 @@
168 Name="VCFxCopTool" 198 Name="VCFxCopTool"
169 /> 199 />
170 <Tool 200 <Tool
201 Name="VCAppVerifierTool"
202 />
203 <Tool
171 Name="VCPostBuildEventTool" 204 Name="VCPostBuildEventTool"
172 Description="Build Scicos_f.def"
173 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
174 /> 205 />
175 </Configuration> 206 </Configuration>
176 <Configuration 207 <Configuration
177 Name="Release|Win32" 208 Name="Release|Win32"
178 OutputDirectory="$(SolutionDir)libs\" 209 OutputDirectory="$(SolutionDir)bin\"
179 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 210 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
180 ConfigurationType="4" 211 ConfigurationType="2"
181 CharacterSet="2" 212 CharacterSet="1"
182 WholeProgramOptimization="1" 213 WholeProgramOptimization="1"
183 > 214 >
184 <Tool 215 <Tool
185 Name="f2c rule"
186 ExecutionBucket="1"
187 />
188 <Tool
189 Name="VCPreBuildEventTool" 216 Name="VCPreBuildEventTool"
190 ExecutionBucket="2" 217 Description="Build Dependencies"
218 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
191 /> 219 />
192 <Tool 220 <Tool
193 Name="VCCustomBuildTool" 221 Name="VCCustomBuildTool"
194 /> 222 />
195 <Tool 223 <Tool
196 Name="VCWebServiceProxyGeneratorTool" 224 Name="f2c rule"
197 ExecutionBucket="4"
198 /> 225 />
199 <Tool 226 <Tool
200 Name="VCXMLDataGeneratorTool" 227 Name="VCXMLDataGeneratorTool"
201 /> 228 />
202 <Tool 229 <Tool
203 Name="VCMIDLTool" 230 Name="VCMIDLTool"
204 ExecutionBucket="5"
205 /> 231 />
206 <Tool 232 <Tool
207 Name="VCCLCompilerTool" 233 Name="VCCLCompilerTool"
208 ExecutionBucket="6"
209 WholeProgramOptimization="false" 234 WholeProgramOptimization="false"
210 AdditionalIncludeDirectories="../../../../libs/f2c" 235 AdditionalIncludeDirectories="../../../../libs/f2c"
211 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 236 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_F2C_EXPORTS;FORDLL"
212 RuntimeLibrary="2" 237 RuntimeLibrary="2"
238 EnableEnhancedInstructionSet="0"
213 UsePrecompiledHeader="0" 239 UsePrecompiledHeader="0"
214 WarningLevel="3" 240 WarningLevel="3"
215
216 DebugInformationFormat="3" 241 DebugInformationFormat="3"
217 /> 242 />
218 <Tool 243 <Tool
219 Name="VCManagedResourceCompilerTool" 244 Name="VCManagedResourceCompilerTool"
220 ExecutionBucket="7"
221 /> 245 />
222 <Tool 246 <Tool
223 Name="VCResourceCompilerTool" 247 Name="VCResourceCompilerTool"
224 ExecutionBucket="8"
225 /> 248 />
226 <Tool 249 <Tool
227 Name="VCPreLinkEventTool" 250 Name="VCPreLinkEventTool"
228 ExecutionBucket="9" 251 Description="Build boolean_f.def"
252 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul&#x0D;&#x0A;"
253 />
254 <Tool
255 Name="VCLinkerTool"
256 AdditionalDependencies="Libscilab.lib boolean.lib"
257 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
258 LinkIncremental="1"
259 ModuleDefinitionFile="boolean_f.def"
260 GenerateDebugInformation="true"
261 SubSystem="2"
262 OptimizeReferences="2"
263 EnableCOMDATFolding="2"
264 LinkTimeCodeGeneration="0"
265 RandomizedBaseAddress="1"
266 DataExecutionPrevention="0"
267 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
268 TargetMachine="1"
229 /> 269 />
230 <Tool 270 <Tool
231 Name="VCLibrarianTool" 271 Name="VCALinkTool"
232 ExecutionBucket="10"
233 OutputFile="../../../../libs/boolean_f.lib"
234 /> 272 />
235 <Tool 273 <Tool
236 Name="VCALinkTool" 274 Name="VCManifestTool"
237 ExecutionBucket="11"
238 /> 275 />
239 <Tool 276 <Tool
240 Name="VCXDCMakeTool" 277 Name="VCXDCMakeTool"
241 ExecutionBucket="12"
242 /> 278 />
243 <Tool 279 <Tool
244 Name="VCBscMakeTool" 280 Name="VCBscMakeTool"
245 ExecutionBucket="13"
246 /> 281 />
247 <Tool 282 <Tool
248 Name="VCFxCopTool" 283 Name="VCFxCopTool"
249 ExecutionBucket="14" 284 />
285 <Tool
286 Name="VCAppVerifierTool"
250 /> 287 />
251 <Tool 288 <Tool
252 Name="VCPostBuildEventTool" 289 Name="VCPostBuildEventTool"
253 Description="Build Scicos_f.def"
254 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
255 ExecutionBucket="15"
256 /> 290 />
257 </Configuration> 291 </Configuration>
258 <Configuration 292 <Configuration
259 Name="Release|x64" 293 Name="Release|x64"
260 OutputDirectory="$(SolutionDir)libs\" 294 OutputDirectory="$(SolutionDir)bin\"
261 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" 295 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
262 ConfigurationType="4" 296 ConfigurationType="2"
263 CharacterSet="2" 297 CharacterSet="1"
264 WholeProgramOptimization="1" 298 WholeProgramOptimization="1"
265 > 299 >
266 <Tool 300 <Tool
267 Name="VCPreBuildEventTool" 301 Name="VCPreBuildEventTool"
302 Description="Build Dependencies"
303 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)boolean_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)boolean.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;&#x0D;&#x0A;"
268 /> 304 />
269 <Tool 305 <Tool
270 Name="VCCustomBuildTool" 306 Name="VCCustomBuildTool"
@@ -275,7 +311,6 @@
275 <Tool 311 <Tool
276 Name="VCXMLDataGeneratorTool" 312 Name="VCXMLDataGeneratorTool"
277 /> 313 />
278
279 <Tool 314 <Tool
280 Name="VCMIDLTool" 315 Name="VCMIDLTool"
281 TargetEnvironment="3" 316 TargetEnvironment="3"
@@ -284,11 +319,11 @@
284 Name="VCCLCompilerTool" 319 Name="VCCLCompilerTool"
285 WholeProgramOptimization="false" 320 WholeProgramOptimization="false"
286 AdditionalIncludeDirectories="../../../../libs/f2c" 321 AdditionalIncludeDirectories="../../../../libs/f2c"
287 PreprocessorDefinitions="WIN32;NDEBUG;_LIB" 322 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BOOLEAN_F2C_EXPORTS;FORDLL"
288 RuntimeLibrary="2" 323 RuntimeLibrary="2"
324 EnableEnhancedInstructionSet="1"
289 UsePrecompiledHeader="0" 325 UsePrecompiledHeader="0"
290 WarningLevel="3" 326 WarningLevel="3"
291
292 DebugInformationFormat="3" 327 DebugInformationFormat="3"
293 /> 328 />
294 <Tool 329 <Tool
@@ -299,13 +334,30 @@
299 /> 334 />
300 <Tool 335 <Tool
301 Name="VCPreLinkEventTool" 336 Name="VCPreLinkEventTool"
337 Description="Build boolean_f.def"
338 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n boolean_f.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;copy boolean_f_header.def+boolean_f.vcdef boolean_f.def &gt;nul&#x0D;&#x0A;"
339 />
340 <Tool
341 Name="VCLinkerTool"
342 AdditionalDependencies="Libscilab.lib boolean.lib"
343 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
344 LinkIncremental="1"
345 ModuleDefinitionFile="boolean_f.def"
346 GenerateDebugInformation="true"
347 SubSystem="2"
348 OptimizeReferences="2"
349 EnableCOMDATFolding="2"
350 LinkTimeCodeGeneration="0"
351 RandomizedBaseAddress="1"
352 DataExecutionPrevention="0"
353 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
354 TargetMachine="17"
302 /> 355 />
303 <Tool 356 <Tool
304 Name="VCLibrarianTool" 357 Name="VCALinkTool"
305 OutputFile="../../../../libs/boolean_f.lib"
306 /> 358 />
307 <Tool 359 <Tool
308 Name="VCALinkTool" 360 Name="VCManifestTool"
309 /> 361 />
310 <Tool 362 <Tool
311 Name="VCXDCMakeTool" 363 Name="VCXDCMakeTool"
@@ -317,9 +369,10 @@
317 Name="VCFxCopTool" 369 Name="VCFxCopTool"
318 /> 370 />
319 <Tool 371 <Tool
372 Name="VCAppVerifierTool"
373 />
374 <Tool
320 Name="VCPostBuildEventTool" 375 Name="VCPostBuildEventTool"
321 Description="Build Scicos_f.def"
322 CommandLine="cd $(IntDir)&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %%f &gt;nul&#x0D;&#x0A;copy *.def boolean_f.def &gt;nul&#x0D;&#x0A;copy boolean_f.def ..\..\..\..\..\libs\boolean_f.vcdef &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd ..&#x0D;&#x0A;"
323 /> 376 />
324 </Configuration> 377 </Configuration>
325 </Configurations> 378 </Configurations>
@@ -361,7 +414,7 @@
361 > 414 >
362 </Filter> 415 </Filter>
363 <Filter 416 <Filter
364 Name="Fortran Files" 417 Name="Fortran files"
365 > 418 >
366 <File 419 <File
367 RelativePath=".\find.f" 420 RelativePath=".\find.f"
@@ -380,6 +433,22 @@
380 > 433 >
381 </File> 434 </File>
382 </Filter> 435 </Filter>
436 <Filter
437 Name="Libraries Dependencies"
438 >
439 <File
440 RelativePath=".\boolean_Import.def"
441 >
442 </File>
443 <File
444 RelativePath=".\LibScilab_Import.def"
445 >
446 </File>
447 </Filter>
448 <File
449 RelativePath="..\..\..\..\bin\blasplus.lib"
450 >
451 </File>
383 <File 452 <File
384 RelativePath="..\..\sci_gateway\boolean_gateway.xml" 453 RelativePath="..\..\sci_gateway\boolean_gateway.xml"
385 > 454 >
diff --git a/scilab/modules/boolean/src/fortran/boolean_f_header.def b/scilab/modules/boolean/src/fortran/boolean_f_header.def
new file mode 100644
index 0000000..a15dba7
--- /dev/null
+++ b/scilab/modules/boolean/src/fortran/boolean_f_header.def
@@ -0,0 +1,8 @@
1LIBRARY boolean_f.dll
2
3
4EXPORTS
5; ---------------------------------------
6; boolean_f
7; ---------------------------------------
8
diff --git a/scilab/modules/boolean/src/fortran/logic.f b/scilab/modules/boolean/src/fortran/logic.f
index e3b890d..e6a9c20 100644
--- a/scilab/modules/boolean/src/fortran/logic.f
+++ b/scilab/modules/boolean/src/fortran/logic.f
@@ -20,6 +20,8 @@ c
20 integer quote,dot,colon 20 integer quote,dot,colon
21 integer less,great,equal,et,ou,non 21 integer less,great,equal,et,ou,non
22 integer insert,extrac 22 integer insert,extrac
23c
24 character tmpbuf*(bsiz)
23c 25c
24 integer iadr,sadr,op,top0 26 integer iadr,sadr,op,top0
25 logical isany 27 logical isany
@@ -36,8 +38,8 @@ c
36 top0=top 38 top0=top
37c 39c
38 if (ddt .eq. 4) then 40 if (ddt .eq. 4) then
39 write(buf(1:4),'(i4)') fin 41 write(tmpbuf(1:4),'(i4)') fin
40 call basout(io,wte,' logic op: '//buf(1:4)) 42 call basout(io,wte,' logic op: '//tmpbuf(1:4))
41 endif 43 endif
42c 44c
43 lw=lstk(top+1) 45 lw=lstk(top+1)
diff --git a/scilab/modules/cacsd/src/c/cacsd.vcproj b/scilab/modules/cacsd/src/c/cacsd.vcproj
index 8f9c145..3eb6af9 100644
--- a/scilab/modules/cacsd/src/c/cacsd.vcproj
+++ b/scilab/modules/cacsd/src/c/cacsd.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -35,7 +35,6 @@
35 <Tool 35 <Tool
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38
39 <Tool 38 <Tool
40 Name="VCMIDLTool" 39 Name="VCMIDLTool"
41 /> 40 />
@@ -54,7 +53,6 @@
54 ProgramDataBaseFileName="$(ConfigurationName)/" 53 ProgramDataBaseFileName="$(ConfigurationName)/"
55 WarningLevel="3" 54 WarningLevel="3"
56 SuppressStartupBanner="true" 55 SuppressStartupBanner="true"
57
58 DebugInformationFormat="3" 56 DebugInformationFormat="3"
59 CompileAs="0" 57 CompileAs="0"
60 /> 58 />
@@ -71,7 +69,7 @@
71 /> 69 />
72 <Tool 70 <Tool
73 Name="VCLibrarianTool" 71 Name="VCLibrarianTool"
74 OutputFile="../../../../libs/cacsd.lib" 72 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
75 SuppressStartupBanner="true" 73 SuppressStartupBanner="true"
76 /> 74 />
77 <Tool 75 <Tool
@@ -109,7 +107,6 @@
109 <Tool 107 <Tool
110 Name="VCXMLDataGeneratorTool" 108 Name="VCXMLDataGeneratorTool"
111 /> 109 />
112
113 <Tool 110 <Tool
114 Name="VCMIDLTool" 111 Name="VCMIDLTool"
115 TargetEnvironment="3" 112 TargetEnvironment="3"
@@ -128,7 +125,6 @@
128 ProgramDataBaseFileName="$(ConfigurationName)/" 125 ProgramDataBaseFileName="$(ConfigurationName)/"
129 WarningLevel="3" 126 WarningLevel="3"
130 SuppressStartupBanner="true" 127 SuppressStartupBanner="true"
131
132 DebugInformationFormat="3" 128 DebugInformationFormat="3"
133 CompileAs="0" 129 CompileAs="0"
134 /> 130 />
@@ -145,7 +141,7 @@
145 /> 141 />
146 <Tool 142 <Tool
147 Name="VCLibrarianTool" 143 Name="VCLibrarianTool"
148 OutputFile="../../../../libs/cacsd.lib" 144 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
149 SuppressStartupBanner="true" 145 SuppressStartupBanner="true"
150 /> 146 />
151 <Tool 147 <Tool
@@ -183,7 +179,6 @@
183 <Tool 179 <Tool
184 Name="VCXMLDataGeneratorTool" 180 Name="VCXMLDataGeneratorTool"
185 /> 181 />
186
187 <Tool 182 <Tool
188 Name="VCMIDLTool" 183 Name="VCMIDLTool"
189 /> 184 />
@@ -206,7 +201,6 @@
206 ProgramDataBaseFileName="$(ConfigurationName)/" 201 ProgramDataBaseFileName="$(ConfigurationName)/"
207 WarningLevel="3" 202 WarningLevel="3"
208 SuppressStartupBanner="true" 203 SuppressStartupBanner="true"
209
210 CompileAs="0" 204 CompileAs="0"
211 /> 205 />
212 <Tool 206 <Tool
@@ -222,7 +216,7 @@
222 /> 216 />
223 <Tool 217 <Tool
224 Name="VCLibrarianTool" 218 Name="VCLibrarianTool"
225 OutputFile="../../../../libs/cacsd.lib" 219 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
226 SuppressStartupBanner="true" 220 SuppressStartupBanner="true"
227 /> 221 />
228 <Tool 222 <Tool
@@ -260,7 +254,6 @@
260 <Tool 254 <Tool
261 Name="VCXMLDataGeneratorTool" 255 Name="VCXMLDataGeneratorTool"
262 /> 256 />
263
264 <Tool 257 <Tool
265 Name="VCMIDLTool" 258 Name="VCMIDLTool"
266 TargetEnvironment="3" 259 TargetEnvironment="3"
@@ -283,7 +276,6 @@
283 ProgramDataBaseFileName="$(ConfigurationName)/" 276 ProgramDataBaseFileName="$(ConfigurationName)/"
284 WarningLevel="3" 277 WarningLevel="3"
285 SuppressStartupBanner="true" 278 SuppressStartupBanner="true"
286
287 CompileAs="0" 279 CompileAs="0"
288 /> 280 />
289 <Tool 281 <Tool
@@ -299,7 +291,7 @@
299 /> 291 />
300 <Tool 292 <Tool
301 Name="VCLibrarianTool" 293 Name="VCLibrarianTool"
302 OutputFile="../../../../libs/cacsd.lib" 294 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
303 SuppressStartupBanner="true" 295 SuppressStartupBanner="true"
304 /> 296 />
305 <Tool 297 <Tool
diff --git a/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj b/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
index de306aa..5c0174b 100644
--- a/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
+++ b/scilab/modules/cacsd/src/fortran/cacsd_f.vfproj
@@ -6,7 +6,7 @@
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 8 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
9 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 9 <Tool Name="VFLibrarianTool" OutputFile="$(SolutionDir)libs\$(ProjectName).lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 11 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
12 <Tool Name="VFCustomBuildTool"/> 12 <Tool Name="VFCustomBuildTool"/>
@@ -22,7 +22,7 @@ cd .."/>
22 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 22 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
23 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 23 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 24 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
25 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 25 <Tool Name="VFLibrarianTool" OutputFile="$(SolutionDir)libs\$(ProjectName).lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>
27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
28 <Tool Name="VFCustomBuildTool"/> 28 <Tool Name="VFCustomBuildTool"/>
@@ -37,7 +37,7 @@ cd .."/>
37 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 37 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
38 <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 38 <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
39 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/> 39 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="../../includes;../../../core/includes;" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDebugDLL"/>
40 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 40 <Tool Name="VFLibrarianTool" OutputFile="$(SolutionDir)libs\$(ProjectName).lib"/>
41 <Tool Name="VFResourceCompilerTool"/> 41 <Tool Name="VFResourceCompilerTool"/>
42 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 42 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
43 <Tool Name="VFCustomBuildTool"/> 43 <Tool Name="VFCustomBuildTool"/>
@@ -53,7 +53,7 @@ cd .."/>
53 <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> 53 <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)libs\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary">
54 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 54 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../includes;../../../core/includes;" PreprocessorDefinitions="WIN32" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
55 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> 55 <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/>
56 <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/cacsd_f.lib"/> 56 <Tool Name="VFLibrarianTool" OutputFile="$(SolutionDir)libs\$(ProjectName).lib"/>
57 <Tool Name="VFResourceCompilerTool"/> 57 <Tool Name="VFResourceCompilerTool"/>
58 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 58 <Tool Name="VFMidlTool" SuppressStartupBanner="true" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
59 <Tool Name="VFCustomBuildTool"/> 59 <Tool Name="VFCustomBuildTool"/>
diff --git a/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcproj b/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcproj
index 1882ba6..5de22d2 100644
--- a/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcproj
+++ b/scilab/modules/cacsd/src/fortran/cacsd_f2c.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -40,10 +40,7 @@
40 <Tool 40 <Tool
41 Name="VCCustomBuildTool" 41 Name="VCCustomBuildTool"
42 /> 42 />
43 <Tool 43
44 Name="VCWebServiceProxyGeneratorTool"
45 ExecutionBucket="4"
46 />
47 <Tool 44 <Tool
48 Name="VCXMLDataGeneratorTool" 45 Name="VCXMLDataGeneratorTool"
49 /> 46 />
@@ -62,7 +59,6 @@
62 RuntimeLibrary="3" 59 RuntimeLibrary="3"
63 UsePrecompiledHeader="0" 60 UsePrecompiledHeader="0"
64 WarningLevel="3" 61 WarningLevel="3"
65
66 DebugInformationFormat="3" 62 DebugInformationFormat="3"
67 /> 63 />
68 <Tool 64 <Tool
@@ -80,7 +76,7 @@
80 <Tool 76 <Tool
81 Name="VCLibrarianTool" 77 Name="VCLibrarianTool"
82 ExecutionBucket="10" 78 ExecutionBucket="10"
83 OutputFile="../../../../libs/cacsd_f.lib" 79 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
84 /> 80 />
85 <Tool 81 <Tool
86 Name="VCALinkTool" 82 Name="VCALinkTool"
@@ -124,7 +120,6 @@
124 <Tool 120 <Tool
125 Name="VCXMLDataGeneratorTool" 121 Name="VCXMLDataGeneratorTool"
126 /> 122 />
127
128 <Tool 123 <Tool
129 Name="VCMIDLTool" 124 Name="VCMIDLTool"
130 TargetEnvironment="3" 125 TargetEnvironment="3"
@@ -139,7 +134,6 @@
139 RuntimeLibrary="3" 134 RuntimeLibrary="3"
140 UsePrecompiledHeader="0" 135 UsePrecompiledHeader="0"
141 WarningLevel="3" 136 WarningLevel="3"
142
143 DebugInformationFormat="3" 137 DebugInformationFormat="3"
144 /> 138 />
145 <Tool 139 <Tool
@@ -153,7 +147,7 @@
153 /> 147 />
154 <Tool 148 <Tool
155 Name="VCLibrarianTool" 149 Name="VCLibrarianTool"
156 OutputFile="../../../../libs/cacsd_f.lib" 150 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
157 /> 151 />
158 <Tool 152 <Tool
159 Name="VCALinkTool" 153 Name="VCALinkTool"
@@ -192,10 +186,7 @@
192 <Tool 186 <Tool
193 Name="VCCustomBuildTool" 187 Name="VCCustomBuildTool"
194 /> 188 />
195 <Tool 189
196 Name="VCWebServiceProxyGeneratorTool"
197 ExecutionBucket="4"
198 />
199 <Tool 190 <Tool
200 Name="VCXMLDataGeneratorTool" 191 Name="VCXMLDataGeneratorTool"
201 /> 192 />
@@ -212,7 +203,6 @@
212 RuntimeLibrary="2" 203 RuntimeLibrary="2"
213 UsePrecompiledHeader="0" 204 UsePrecompiledHeader="0"
214 WarningLevel="3" 205 WarningLevel="3"
215
216 DebugInformationFormat="3" 206 DebugInformationFormat="3"
217 /> 207 />
218 <Tool 208 <Tool
@@ -230,7 +220,7 @@
230 <Tool 220 <Tool
231 Name="VCLibrarianTool" 221 Name="VCLibrarianTool"
232 ExecutionBucket="10" 222 ExecutionBucket="10"
233 OutputFile="../../../../libs/cacsd_f.lib" 223 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
234 /> 224 />
235 <Tool 225 <Tool
236 Name="VCALinkTool" 226 Name="VCALinkTool"
@@ -275,7 +265,6 @@
275 <Tool 265 <Tool
276 Name="VCXMLDataGeneratorTool" 266 Name="VCXMLDataGeneratorTool"
277 /> 267 />
278
279 <Tool 268 <Tool
280 Name="VCMIDLTool" 269 Name="VCMIDLTool"
281 TargetEnvironment="3" 270 TargetEnvironment="3"
@@ -288,7 +277,6 @@
288 RuntimeLibrary="2" 277 RuntimeLibrary="2"
289 UsePrecompiledHeader="0" 278 UsePrecompiledHeader="0"
290 WarningLevel="3" 279 WarningLevel="3"
291
292 DebugInformationFormat="3" 280 DebugInformationFormat="3"
293 /> 281 />
294 <Tool 282 <Tool
@@ -302,7 +290,7 @@
302 /> 290 />
303 <Tool 291 <Tool
304 Name="VCLibrarianTool" 292 Name="VCLibrarianTool"
305 OutputFile="../../../../libs/cacsd_f.lib" 293 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
306 /> 294 />
307 <Tool 295 <Tool
308 Name="VCALinkTool" 296 Name="VCALinkTool"
diff --git a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
index d21ea26..350e926 100644
--- a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
+++ b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.vfproj
@@ -6,7 +6,7 @@
6 <Configurations> 6 <Configurations>
7 <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
8 <Tool Name="VFFortranCompilerTool" 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" 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\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib 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"/>
12 <Tool Name="VFCustomBuildTool"/> 12 <Tool Name="VFCustomBuildTool"/>
@@ -23,7 +23,7 @@ lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE
23 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 23 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
24 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 24 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
25 <Tool Name="VFFortranCompilerTool" 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="VFFortranCompilerTool" 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="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 26 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
27 <Tool Name="VFResourceCompilerTool"/> 27 <Tool Name="VFResourceCompilerTool"/>
28 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 28 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
29 <Tool Name="VFCustomBuildTool"/> 29 <Tool Name="VFCustomBuildTool"/>
@@ -40,7 +40,7 @@ lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE
40 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 40 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
41 <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 41 <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
42 <Tool Name="VFFortranCompilerTool" 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"/> 42 <Tool Name="VFFortranCompilerTool" 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"/>
43 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 43 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
44 <Tool Name="VFResourceCompilerTool"/> 44 <Tool Name="VFResourceCompilerTool"/>
45 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 45 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
46 <Tool Name="VFCustomBuildTool"/> 46 <Tool Name="VFCustomBuildTool"/>
@@ -57,7 +57,7 @@ lib /DEF:&quot;$(InputDir)Libscilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE
57 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 57 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
58 <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 58 <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
59 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 59 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
60 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\slicot_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\slicot_f.lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/> 60 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="slicot_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="linear_algebra_f.lib libscilab.lib"/>
61 <Tool Name="VFResourceCompilerTool"/> 61 <Tool Name="VFResourceCompilerTool"/>
62 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 62 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
63 <Tool Name="VFCustomBuildTool"/> 63 <Tool Name="VFCustomBuildTool"/>
diff --git a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcproj b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcproj
index a1f331e..488e2c2 100644
--- a/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcproj
+++ b/scilab/modules/cacsd/src/slicot/slicot_f/slicot_f2c.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -42,10 +42,7 @@
42 <Tool 42 <Tool
43 Name="VCCustomBuildTool" 43 Name="VCCustomBuildTool"
44 /> 44 />
45 <Tool 45
46 Name="VCWebServiceProxyGeneratorTool"
47 ExecutionBucket="4"
48 />
49 <Tool 46 <Tool
50 Name="VCXMLDataGeneratorTool" 47 Name="VCXMLDataGeneratorTool"
51 /> 48 />
@@ -64,7 +61,6 @@
64 RuntimeLibrary="3" 61 RuntimeLibrary="3"
65 UsePrecompiledHeader="0" 62 UsePrecompiledHeader="0"
66 WarningLevel="3" 63 WarningLevel="3"
67
68 DebugInformationFormat="3" 64 DebugInformationFormat="3"
69 /> 65 />
70 <Tool 66 <Tool
@@ -86,13 +82,14 @@
86 ExecutionBucket="10" 82 ExecutionBucket="10"
87 AdditionalOptions="/ignore:4049" 83 AdditionalOptions="/ignore:4049"
88 AdditionalDependencies="linear_algebra_f.lib libscilab.lib" 84 AdditionalDependencies="linear_algebra_f.lib libscilab.lib"
89 OutputFile="$(SolutionDir)bin\slicot_f.dll" 85 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
90 LinkIncremental="2" 86 LinkIncremental="2"
91 ModuleDefinitionFile="slicot_f.def" 87 ModuleDefinitionFile="slicot_f.def"
92 GenerateDebugInformation="true" 88 GenerateDebugInformation="true"
93 SubSystem="2" 89 SubSystem="2"
94 RandomizedBaseAddress="1" 90 RandomizedBaseAddress="1"
95 DataExecutionPrevention="0" 91 DataExecutionPrevention="0"
92 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
96 TargetMachine="1" 93 TargetMachine="1"
97 CLRUnmanagedCodeCheck="true" 94 CLRUnmanagedCodeCheck="true"
98 /> 95 />
@@ -145,7 +142,6 @@
145 <Tool 142 <Tool
146 Name="VCXMLDataGeneratorTool" 143 Name="VCXMLDataGeneratorTool"
147 /> 144 />
148
149 <Tool 145 <Tool
150 Name="VCMIDLTool" 146 Name="VCMIDLTool"
151 TargetEnvironment="3" 147 TargetEnvironment="3"
@@ -160,7 +156,6 @@
160 RuntimeLibrary="3" 156 RuntimeLibrary="3"
161 UsePrecompiledHeader="0" 157 UsePrecompiledHeader="0"
162 WarningLevel="3" 158 WarningLevel="3"
163
164 DebugInformationFormat="3" 159 DebugInformationFormat="3"
165 /> 160 />
166 <Tool 161 <Tool
@@ -178,13 +173,14 @@
178 Name="VCLinkerTool" 173 Name="VCLinkerTool"
179 AdditionalOptions="/ignore:4049" 174 AdditionalOptions="/ignore:4049"
180 AdditionalDependencies="linear_algebra_f.lib libscilab.lib" 175 AdditionalDependencies="linear_algebra_f.lib libscilab.lib"
181 OutputFile="$(SolutionDir)bin\slicot_f.dll" 176 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
182 LinkIncremental="2" 177 LinkIncremental="2"
183 ModuleDefinitionFile="slicot_f.def" 178 ModuleDefinitionFile="slicot_f.def"
184 GenerateDebugInformation="true" 179 GenerateDebugInformation="true"
185 SubSystem="2" 180 SubSystem="2"
186 RandomizedBaseAddress="1" 181 RandomizedBaseAddress="1"
187 DataExecutionPrevention="0" 182 DataExecutionPrevention="0"
183 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
188 TargetMachine="17" 184 TargetMachine="17"
189 CLRUnmanagedCodeCheck="true" 185 CLRUnmanagedCodeCheck="true"
190 /> 186 />
@@ -232,7 +228,6 @@
232 <Tool 228 <Tool
233 Name="VCXMLDataGeneratorTool" 229 Name="VCXMLDataGeneratorTool"
234 /> 230 />
235
236 <Tool 231 <Tool
237 Name="VCMIDLTool" 232 Name="VCMIDLTool"
238 /> 233 />
@@ -245,7 +240,6 @@
245 EnableEnhancedInstructionSet="0" 240 EnableEnhancedInstructionSet="0"
246 UsePrecompiledHeader="0" 241 UsePrecompiledHeader="0"
247 WarningLevel="3" 242 WarningLevel="3"
248
249 DebugInformationFormat="3" 243 DebugInformationFormat="3"
250 /> 244 />
251 <Tool 245 <Tool
@@ -263,7 +257,7 @@
263 Name="VCLinkerTool" 257 Name="VCLinkerTool"
264 AdditionalOptions="/ignore:4049" 258 AdditionalOptions="/ignore:4049"
265 AdditionalDependencies="linear_algebra_f.lib libscilab.lib" 259 AdditionalDependencies="linear_algebra_f.lib libscilab.lib"
266 OutputFile="$(SolutionDir)bin\slicot_f.dll" 260 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
267 LinkIncremental="1" 261 LinkIncremental="1"
268 ModuleDefinitionFile="slicot_f.def" 262 ModuleDefinitionFile="slicot_f.def"
269 GenerateDebugInformation="true" 263 GenerateDebugInformation="true"
@@ -273,6 +267,7 @@
273 LinkTimeCodeGeneration="0" 267 LinkTimeCodeGeneration="0"
274 RandomizedBaseAddress="1" 268 RandomizedBaseAddress="1"
275 DataExecutionPrevention="0" 269 DataExecutionPrevention="0"
270 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
276 TargetMachine="1" 271 TargetMachine="1"
277 CLRUnmanagedCodeCheck="true" 272 CLRUnmanagedCodeCheck="true"
278 /> 273 />
@@ -320,7 +315,6 @@
320 <Tool 315 <Tool
321 Name="VCXMLDataGeneratorTool" 316 Name="VCXMLDataGeneratorTool"
322 /> 317 />
323
324 <Tool 318 <Tool
325 Name="VCMIDLTool" 319 Name="VCMIDLTool"
326 TargetEnvironment="3" 320 TargetEnvironment="3"
@@ -334,7 +328,6 @@
334 EnableEnhancedInstructionSet="1" 328 EnableEnhancedInstructionSet="1"
335 UsePrecompiledHeader="0" 329 UsePrecompiledHeader="0"
336 WarningLevel="3" 330 WarningLevel="3"
337
338 DebugInformationFormat="3" 331 DebugInformationFormat="3"
339 /> 332 />
340 <Tool 333 <Tool
@@ -352,7 +345,7 @@
352 Name="VCLinkerTool" 345 Name="VCLinkerTool"
353 AdditionalOptions="/ignore:4049" 346 AdditionalOptions="/ignore:4049"
354 AdditionalDependencies="linear_algebra_f.lib libscilab.lib" 347 AdditionalDependencies="linear_algebra_f.lib libscilab.lib"
355 OutputFile="$(SolutionDir)bin\slicot_f.dll" 348 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
356 LinkIncremental="1" 349 LinkIncremental="1"
357 ModuleDefinitionFile="slicot_f.def" 350 ModuleDefinitionFile="slicot_f.def"
358 GenerateDebugInformation="true" 351 GenerateDebugInformation="true"
@@ -362,6 +355,7 @@
362 LinkTimeCodeGeneration="0" 355 LinkTimeCodeGeneration="0"
363 RandomizedBaseAddress="1" 356 RandomizedBaseAddress="1"
364 DataExecutionPrevention="0" 357 DataExecutionPrevention="0"
358 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
365 TargetMachine="17" 359 TargetMachine="17"
366 CLRUnmanagedCodeCheck="true" 360 CLRUnmanagedCodeCheck="true"
367 /> 361 />
diff --git a/scilab/modules/call_scilab/call_scilab.vcproj b/scilab/modules/call_scilab/call_scilab.vcproj
index 22e6129..4eef893 100644
--- a/scilab/modules/call_scilab/call_scilab.vcproj
+++ b/scilab/modules/call_scilab/call_scilab.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -35,7 +35,6 @@
35 <Tool 35 <Tool
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38
39 <Tool 38 <Tool
40 Name="VCMIDLTool" 39 Name="VCMIDLTool"
41 /> 40 />
@@ -50,7 +49,6 @@
50 RuntimeLibrary="3" 49 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 50 UsePrecompiledHeader="0"
52 WarningLevel="3" 51 WarningLevel="3"
53
54 DebugInformationFormat="3" 52 DebugInformationFormat="3"
55 /> 53 />
56 <Tool 54 <Tool
@@ -67,14 +65,14 @@
67 <Tool 65 <Tool
68 Name="VCLinkerTool" 66 Name="VCLinkerTool"
69 AdditionalDependencies="LibScilab.lib" 67 AdditionalDependencies="LibScilab.lib"
70 OutputFile="../../bin/$(ProjectName).dll" 68 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
71 LinkIncremental="1" 69 LinkIncremental="1"
72 ModuleDefinitionFile="call_scilab_export.def" 70 ModuleDefinitionFile="call_scilab_export.def"
73 GenerateDebugInformation="true" 71 GenerateDebugInformation="true"
74 SubSystem="2" 72 SubSystem="2"
75 RandomizedBaseAddress="1" 73 RandomizedBaseAddress="1"
76 DataExecutionPrevention="0" 74 DataExecutionPrevention="0"
77 ImportLibrary="../../bin/$(ProjectName).lib" 75 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
78 TargetMachine="1" 76 TargetMachine="1"
79 CLRUnmanagedCodeCheck="true" 77 CLRUnmanagedCodeCheck="true"
80 /> 78 />
@@ -116,7 +114,6 @@
116 <Tool 114 <Tool
117 Name="VCXMLDataGeneratorTool" 115 Name="VCXMLDataGeneratorTool"
118 /> 116 />
119
120 <Tool 117 <Tool
121 Name="VCMIDLTool" 118 Name="VCMIDLTool"
122 TargetEnvironment="3" 119 TargetEnvironment="3"
@@ -131,7 +128,6 @@
131 RuntimeLibrary="3" 128 RuntimeLibrary="3"
132 UsePrecompiledHeader="0" 129 UsePrecompiledHeader="0"
133 WarningLevel="3" 130 WarningLevel="3"
134
135 DebugInformationFormat="3" 131 DebugInformationFormat="3"
136 /> 132 />
137 <Tool 133 <Tool
@@ -148,14 +144,14 @@
148 <Tool 144 <Tool
149 Name="VCLinkerTool" 145 Name="VCLinkerTool"
150 AdditionalDependencies="LibScilab.lib" 146 AdditionalDependencies="LibScilab.lib"
151 OutputFile="../../bin/$(ProjectName).dll" 147 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
152 LinkIncremental="1" 148 LinkIncremental="1"
153 ModuleDefinitionFile="call_scilab_export.def" 149 ModuleDefinitionFile="call_scilab_export.def"
154 GenerateDebugInformation="true" 150 GenerateDebugInformation="true"
155 SubSystem="2" 151 SubSystem="2"
156 RandomizedBaseAddress="1" 152 RandomizedBaseAddress="1"
157 DataExecutionPrevention="0" 153 DataExecutionPrevention="0"
158 ImportLibrary="../../bin/$(ProjectName).lib" 154 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
159 TargetMachine="17" 155 TargetMachine="17"
160 CLRUnmanagedCodeCheck="true" 156 CLRUnmanagedCodeCheck="true"
161 /> 157 />
@@ -198,7 +194,6 @@
198 <Tool 194 <Tool
199 Name="VCXMLDataGeneratorTool" 195 Name="VCXMLDataGeneratorTool"
200 /> 196 />
201
202 <Tool 197 <Tool
203 Name="VCMIDLTool" 198 Name="VCMIDLTool"
204 /> 199 />
@@ -216,7 +211,6 @@
216 EnableEnhancedInstructionSet="0" 211 EnableEnhancedInstructionSet="0"
217 UsePrecompiledHeader="0" 212 UsePrecompiledHeader="0"
218 WarningLevel="3" 213 WarningLevel="3"
219
220 DebugInformationFormat="0" 214 DebugInformationFormat="0"
221 /> 215 />
222 <Tool 216 <Tool
@@ -233,7 +227,7 @@
233 <Tool 227 <Tool
234 Name="VCLinkerTool" 228 Name="VCLinkerTool"
235 AdditionalDependencies="LibScilab.lib" 229 AdditionalDependencies="LibScilab.lib"
236 OutputFile="../../bin/$(ProjectName).dll" 230 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
237 LinkIncremental="1" 231 LinkIncremental="1"
238 ModuleDefinitionFile="call_scilab_export.def" 232 ModuleDefinitionFile="call_scilab_export.def"
239 GenerateDebugInformation="false" 233 GenerateDebugInformation="false"
@@ -243,7 +237,7 @@
243 LinkTimeCodeGeneration="0" 237 LinkTimeCodeGeneration="0"
244 RandomizedBaseAddress="1" 238 RandomizedBaseAddress="1"
245 DataExecutionPrevention="0" 239 DataExecutionPrevention="0"
246 ImportLibrary="../../bin/$(ProjectName).lib" 240 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
247 TargetMachine="1" 241 TargetMachine="1"
248 CLRUnmanagedCodeCheck="true" 242 CLRUnmanagedCodeCheck="true"
249 /> 243 />
@@ -286,7 +280,6 @@
286 <Tool 280 <Tool
287 Name="VCXMLDataGeneratorTool" 281 Name="VCXMLDataGeneratorTool"
288 /> 282 />
289
290 <Tool 283 <Tool
291 Name="VCMIDLTool" 284 Name="VCMIDLTool"
292 TargetEnvironment="3" 285 TargetEnvironment="3"
@@ -304,7 +297,6 @@
304 EnableEnhancedInstructionSet="0" 297 EnableEnhancedInstructionSet="0"
305 UsePrecompiledHeader="0" 298 UsePrecompiledHeader="0"
306 WarningLevel="3" 299 WarningLevel="3"
307
308 DebugInformationFormat="0" 300 DebugInformationFormat="0"
309 /> 301 />
310 <Tool 302 <Tool
@@ -321,7 +313,7 @@
321 <Tool 313 <Tool
322 Name="VCLinkerTool" 314 Name="VCLinkerTool"
323 AdditionalDependencies="LibScilab.lib" 315 AdditionalDependencies="LibScilab.lib"
324 OutputFile="../../bin/$(ProjectName).dll" 316 OutputFile="$(SolutionDir)bin\$(ProjectName).dll"
325 LinkIncremental="1" 317 LinkIncremental="1"
326 ModuleDefinitionFile="call_scilab_export.def" 318 ModuleDefinitionFile="call_scilab_export.def"
327 GenerateDebugInformation="false" 319 GenerateDebugInformation="false"
@@ -331,7 +323,7 @@
331 LinkTimeCodeGeneration="0" 323 LinkTimeCodeGeneration="0"
332 RandomizedBaseAddress="1" 324 RandomizedBaseAddress="1"
333 DataExecutionPrevention="0" 325 DataExecutionPrevention="0"
334 ImportLibrary="../../bin/$(ProjectName).lib" 326 ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib"
335 TargetMachine="17" 327 TargetMachine="17"
336 CLRUnmanagedCodeCheck="true" 328 CLRUnmanagedCodeCheck="true"
337 /> 329 />
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
index aea4117..7bb8888 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwriteboolean_vc/readwriteboolean.vcproj
@@ -232,7 +232,7 @@
232 SubSystem="1" 232 SubSystem="1"
233 OptimizeReferences="2" 233 OptimizeReferences="2"
234 EnableCOMDATFolding="2" 234 EnableCOMDATFolding="2"
235 OptimizeForWindows98="0" 235
236 RandomizedBaseAddress="1" 236 RandomizedBaseAddress="1"
237 DataExecutionPrevention="0" 237 DataExecutionPrevention="0"
238 TargetMachine="1" 238 TargetMachine="1"
@@ -314,7 +314,7 @@
314 SubSystem="1" 314 SubSystem="1"
315 OptimizeReferences="2" 315 OptimizeReferences="2"
316 EnableCOMDATFolding="2" 316 EnableCOMDATFolding="2"
317 OptimizeForWindows98="0" 317
318 RandomizedBaseAddress="1" 318 RandomizedBaseAddress="1"
319 DataExecutionPrevention="0" 319 DataExecutionPrevention="0"
320 TargetMachine="17" 320 TargetMachine="17"
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
index f45c656..16f76a8 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwritecomplexmatrix_vc/readwritecomplexmatrix.vcproj
@@ -232,7 +232,7 @@
232 SubSystem="1" 232 SubSystem="1"
233 OptimizeReferences="2" 233 OptimizeReferences="2"
234 EnableCOMDATFolding="2" 234 EnableCOMDATFolding="2"
235 OptimizeForWindows98="0" 235
236 RandomizedBaseAddress="1" 236 RandomizedBaseAddress="1"
237 DataExecutionPrevention="0" 237 DataExecutionPrevention="0"
238 TargetMachine="1" 238 TargetMachine="1"
@@ -314,7 +314,7 @@
314 SubSystem="1" 314 SubSystem="1"
315 OptimizeReferences="2" 315 OptimizeReferences="2"
316 EnableCOMDATFolding="2" 316 EnableCOMDATFolding="2"
317 OptimizeForWindows98="0" 317
318 RandomizedBaseAddress="1" 318 RandomizedBaseAddress="1"
319 DataExecutionPrevention="0" 319 DataExecutionPrevention="0"
320 TargetMachine="17" 320 TargetMachine="17"
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
index 9c9c0ab..a3f0bc4 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwritewmatrix_vc/readwritematrix.vcproj
@@ -232,7 +232,7 @@
232 SubSystem="1" 232 SubSystem="1"
233 OptimizeReferences="2" 233 OptimizeReferences="2"
234 EnableCOMDATFolding="2" 234 EnableCOMDATFolding="2"
235 OptimizeForWindows98="0" 235
236 RandomizedBaseAddress="1" 236 RandomizedBaseAddress="1"
237 DataExecutionPrevention="0" 237 DataExecutionPrevention="0"
238 TargetMachine="1" 238 TargetMachine="1"
@@ -314,7 +314,7 @@
314 SubSystem="1" 314 SubSystem="1"
315 OptimizeReferences="2" 315 OptimizeReferences="2"
316 EnableCOMDATFolding="2" 316 EnableCOMDATFolding="2"
317 OptimizeForWindows98="0" 317
318 RandomizedBaseAddress="1" 318 RandomizedBaseAddress="1"
319 DataExecutionPrevention="0" 319 DataExecutionPrevention="0"
320 TargetMachine="17" 320 TargetMachine="17"
diff --git a/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj b/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
index fe70745..220dbf1 100644
--- a/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
+++ b/scilab/modules/call_scilab/examples/basicExamples/readwritewtring_vc/readwritestring.vcproj
@@ -232,7 +232,7 @@
232 SubSystem="1" 232 SubSystem="1"
233 OptimizeReferences="2" 233 OptimizeReferences="2"
234 EnableCOMDATFolding="2" 234 EnableCOMDATFolding="2"
235 OptimizeForWindows98="0" 235
236 RandomizedBaseAddress="1" 236 RandomizedBaseAddress="1"
237 DataExecutionPrevention="0" 237 DataExecutionPrevention="0"
238 TargetMachine="1" 238 TargetMachine="1"
@@ -314,7 +314,7 @@
314 SubSystem="1" 314 SubSystem="1"
315 OptimizeReferences="2" 315 OptimizeReferences="2"
316 EnableCOMDATFolding="2" 316 EnableCOMDATFolding="2"
317 OptimizeForWindows98="0" 317
318 RandomizedBaseAddress="1" 318 RandomizedBaseAddress="1"
319 DataExecutionPrevention="0" 319 DataExecutionPrevention="0"
320 TargetMachine="17" 320 TargetMachine="17"
diff --git a/scilab/modules/completion/src/c/completion.vcproj b/scilab/modules/completion/src/c/completion.vcproj
index 61daeee..ea75d31 100644
--- a/scilab/modules/completion/src/c/completion.vcproj
+++ b/scilab/modules/completion/src/c/completion.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="Windows-1252"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -35,7 +35,6 @@
35 <Tool 35 <Tool
36 Name="VCXMLDataGeneratorTool" 36 Name="VCXMLDataGeneratorTool"
37 /> 37 />
38
39 <Tool 38 <Tool
40 Name="VCMIDLTool" 39 Name="VCMIDLTool"
41 /> 40 />
@@ -50,7 +49,6 @@
50 RuntimeLibrary="3" 49 RuntimeLibrary="3"
51 UsePrecompiledHeader="0" 50 UsePrecompiledHeader="0"
52 WarningLevel="3" 51 WarningLevel="3"
53
54 DebugInformationFormat="3" 52 DebugInformationFormat="3"
55 /> 53 />
56 <Tool 54 <Tool
@@ -67,14 +65,14 @@
67 <Tool 65 <Tool
68 Name="VCLinkerTool" 66 Name="VCLinkerTool"
69 AdditionalDependencies="LibScilab.lib scilab_windows.lib" 67 AdditionalDependencies="LibScilab.lib scilab_windows.lib"
70 OutputFile="../../../../bin/scicompletion.dll" 68 OutputFile="$(SolutionDir)bin\sci$(ProjectName).dll"
71 LinkIncremental="1" 69 LinkIncremental="1"
72 ModuleDefinitionFile="" 70 ModuleDefinitionFile=""
73 GenerateDebugInformation="true" 71 GenerateDebugInformation="true"
74 SubSystem="2" 72 SubSystem="2"
75 RandomizedBaseAddress="1" 73 RandomizedBaseAddress="1"
76 DataExecutionPrevention="0" 74 DataExecutionPrevention="0"
77 ImportLibrary="../../../../bin/scicompletion.lib" 75 ImportLibrary="$(SolutionDir)bin\sci$(ProjectName).lib"
78 TargetMachine="1" 76 TargetMachine="1"
79 CLRUnmanagedCodeCheck="true" 77 CLRUnmanagedCodeCheck="true"
80 /> 78 />
@@ -116,7 +114,6 @@
116 <Tool 114 <Tool
117 Name="VCXMLDataGeneratorTool" 115 Name="VCXMLDataGeneratorTool"
118 /> 116 />
119
120 <Tool 117 <Tool
121 Name="VCMIDLTool" 118 Name="VCMIDLTool"
122 TargetEnvironment="3" 119 TargetEnvironment="3"
@@ -131,7 +128,6 @@
131 RuntimeLibrary="3" 128 RuntimeLibrary="3"
132 UsePrecompiledHeader="0" 129 UsePrecompiledHeader="0"
133 WarningLevel="3" 130 WarningLevel="3"