summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-05-18 17:07:47 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-05-19 10:28:47 +0200
commit57f46d8f05649920505fcc86279833029f115c6c (patch)
treebfed3ac09a2ba5c118e2e9b85a481f26a2a5c180 /scilab/modules/scicos
parent32fce17d94a24fa61a955d1bbce864bf56ff6f5a (diff)
downloadscilab-57f46d8f05649920505fcc86279833029f115c6c.zip
scilab-57f46d8f05649920505fcc86279833029f115c6c.tar.gz
set output directory and intermediate directory values for VS 2010 compatibility
Change-Id: I5be86d9a97c000f72245072a8fbb9ed4de1d40e4
Diffstat (limited to 'scilab/modules/scicos')
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.vcproj18
-rw-r--r--scilab/modules/scicos/src/c/scicos.vcproj16
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.vfproj14
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f2c.vcproj19
-rw-r--r--scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj19
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj16
-rw-r--r--scilab/modules/scicos/src/translator/translator.vcproj16
-rw-r--r--scilab/modules/scicos/src/xml2modelica/xml2modelica.vcproj16
8 files changed, 69 insertions, 65 deletions
diff --git a/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj b/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
index 6796e77..97af96e 100644
--- a/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
+++ b/scilab/modules/scicos/src/c/noscicos/noscicos.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -21,8 +21,8 @@
21 <Configurations> 21 <Configurations>
22 <Configuration 22 <Configuration
23 Name="Debug|Win32" 23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 24 OutputDirectory="$(SolutionDir)bin\"
25 IntermediateDirectory="$(ConfigurationName)" 25 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
26 ConfigurationType="2" 26 ConfigurationType="2"
27 CharacterSet="2" 27 CharacterSet="2"
28 > 28 >
@@ -103,8 +103,8 @@
103 </Configuration> 103 </Configuration>
104 <Configuration 104 <Configuration
105 Name="Debug|x64" 105 Name="Debug|x64"
106 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 106 OutputDirectory="$(SolutionDir)bin\"
107 IntermediateDirectory="$(ConfigurationName)" 107 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
108 ConfigurationType="2" 108 ConfigurationType="2"
109 CharacterSet="2" 109 CharacterSet="2"
110 > 110 >
@@ -185,8 +185,8 @@
185 </Configuration> 185 </Configuration>
186 <Configuration 186 <Configuration
187 Name="Release|Win32" 187 Name="Release|Win32"
188 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 188 OutputDirectory="$(SolutionDir)bin\"
189 IntermediateDirectory="$(ConfigurationName)" 189 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
190 ConfigurationType="2" 190 ConfigurationType="2"
191 CharacterSet="2" 191 CharacterSet="2"
192 WholeProgramOptimization="0" 192 WholeProgramOptimization="0"
@@ -273,8 +273,8 @@
273 </Configuration> 273 </Configuration>
274 <Configuration 274 <Configuration
275 Name="Release|x64" 275 Name="Release|x64"
276 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 276 OutputDirectory="$(SolutionDir)bin\"
277 IntermediateDirectory="$(ConfigurationName)" 277 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
278 ConfigurationType="2" 278 ConfigurationType="2"
279 CharacterSet="2" 279 CharacterSet="2"
280 WholeProgramOptimization="0" 280 WholeProgramOptimization="0"
diff --git a/scilab/modules/scicos/src/c/scicos.vcproj b/scilab/modules/scicos/src/c/scicos.vcproj
index 0f4abd1..15cf9b9 100644
--- a/scilab/modules/scicos/src/c/scicos.vcproj
+++ b/scilab/modules/scicos/src/c/scicos.vcproj
@@ -21,8 +21,8 @@
21 <Configurations> 21 <Configurations>
22 <Configuration 22 <Configuration
23 Name="Debug|Win32" 23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 24 OutputDirectory="$(SolutionDir)bin\"
25 IntermediateDirectory="$(ConfigurationName)" 25 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
26 ConfigurationType="2" 26 ConfigurationType="2"
27 CharacterSet="2" 27 CharacterSet="2"
28 > 28 >
@@ -106,8 +106,8 @@
106 </Configuration> 106 </Configuration>
107 <Configuration 107 <Configuration
108 Name="Debug|x64" 108 Name="Debug|x64"
109 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 109 OutputDirectory="$(SolutionDir)bin\"
110 IntermediateDirectory="$(ConfigurationName)" 110 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
111 ConfigurationType="2" 111 ConfigurationType="2"
112 CharacterSet="2" 112 CharacterSet="2"
113 > 113 >
@@ -192,8 +192,8 @@
192 </Configuration> 192 </Configuration>
193 <Configuration 193 <Configuration
194 Name="Release|Win32" 194 Name="Release|Win32"
195 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 195 OutputDirectory="$(SolutionDir)bin\"
196 IntermediateDirectory="$(ConfigurationName)" 196 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
197 ConfigurationType="2" 197 ConfigurationType="2"
198 CharacterSet="2" 198 CharacterSet="2"
199 WholeProgramOptimization="0" 199 WholeProgramOptimization="0"
@@ -283,8 +283,8 @@
283 </Configuration> 283 </Configuration>
284 <Configuration 284 <Configuration
285 Name="Release|x64" 285 Name="Release|x64"
286 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 286 OutputDirectory="$(SolutionDir)bin\"
287 IntermediateDirectory="$(ConfigurationName)" 287 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
288 ConfigurationType="2" 288 ConfigurationType="2"
289 CharacterSet="2" 289 CharacterSet="2"
290 WholeProgramOptimization="0" 290 WholeProgramOptimization="0"
diff --git a/scilab/modules/scicos/src/fortran/scicos_f.vfproj b/scilab/modules/scicos/src/fortran/scicos_f.vfproj
index ee0bc8c..379c17b 100644
--- a/scilab/modules/scicos/src/fortran/scicos_f.vfproj
+++ b/scilab/modules/scicos/src/fortran/scicos_f.vfproj
@@ -4,7 +4,7 @@
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="$(InputDir)$(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\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/>
10 <Tool Name="VFResourceCompilerTool"/> 10 <Tool Name="VFResourceCompilerTool"/>
@@ -22,7 +22,7 @@ lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X8
22lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/> 22lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
23 <Tool Name="VFPostBuildEventTool"/> 23 <Tool Name="VFPostBuildEventTool"/>
24 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 24 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
25 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 25 <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
26 <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="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"/>
27 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/> 27 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/>
28 <Tool Name="VFResourceCompilerTool"/> 28 <Tool Name="VFResourceCompilerTool"/>
@@ -40,7 +40,7 @@ lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X8
40lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/> 40lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
41 <Tool Name="VFPostBuildEventTool"/> 41 <Tool Name="VFPostBuildEventTool"/>
42 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 42 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
43 <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 43 <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">
44 <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"/> 44 <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"/>
45 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/> 45 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/>
46 <Tool Name="VFResourceCompilerTool"/> 46 <Tool Name="VFResourceCompilerTool"/>
@@ -56,8 +56,9 @@ copy scicos_f_header.def+scicos_f.vcdef scicos_f.def &gt;nul" Description="Build
56 <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 56 <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
57lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL 57lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
58lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/> 58lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
59 <Tool Name="VFPostBuildEventTool"/></Configuration> 59 <Tool Name="VFPostBuildEventTool"/>
60 <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 60 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
61 <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">
61 <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"/> 62 <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"/>
62 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/> 63 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib scicos.lib"/>
63 <Tool Name="VFResourceCompilerTool"/> 64 <Tool Name="VFResourceCompilerTool"/>
@@ -73,7 +74,8 @@ copy scicos_f_header.def+scicos_f.vcdef scicos_f.def &gt;nul" Description="Build
73 <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 74 <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
74lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL 75lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
75lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/> 76lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
76 <Tool Name="VFPostBuildEventTool"/></Configuration></Configurations> 77 <Tool Name="VFPostBuildEventTool"/>
78 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
77 <Files> 79 <Files>
78 <Filter Name="Header Files" Filter="fi;fd"/> 80 <Filter Name="Header Files" Filter="fi;fd"/>
79 <Filter Name="Libraries Dependencies"> 81 <Filter Name="Libraries Dependencies">
diff --git a/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj b/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
index 4e0b467..79d75cc 100644
--- a/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
+++ b/scilab/modules/scicos/src/fortran/scicos_f2c.vcproj
@@ -1,4 +1,4 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
@@ -6,6 +6,7 @@
6 ProjectGUID="{566E524B-D327-4416-A865-9C83503FAB7B}" 6 ProjectGUID="{566E524B-D327-4416-A865-9C83503FAB7B}"
7 RootNamespace="scicos_f2c" 7 RootNamespace="scicos_f2c"
8 Keyword="Win32Proj" 8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0"
9 > 10 >
10 <Platforms> 11 <Platforms>
11 <Platform 12 <Platform
@@ -23,8 +24,8 @@
23 <Configurations> 24 <Configurations>
24 <Configuration 25 <Configuration
25 Name="Debug|Win32" 26 Name="Debug|Win32"
26 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 27 OutputDirectory="$(SolutionDir)bin\"
27 IntermediateDirectory="$(ConfigurationName)" 28 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
28 ConfigurationType="2" 29 ConfigurationType="2"
29 CharacterSet="1" 30 CharacterSet="1"
30 > 31 >
@@ -124,8 +125,8 @@
124 </Configuration> 125 </Configuration>
125 <Configuration 126 <Configuration
126 Name="Debug|x64" 127 Name="Debug|x64"
127 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 128 OutputDirectory="$(SolutionDir)bin\"
128 IntermediateDirectory="$(ConfigurationName)" 129 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
129 ConfigurationType="2" 130 ConfigurationType="2"
130 CharacterSet="1" 131 CharacterSet="1"
131 > 132 >
@@ -211,8 +212,8 @@
211 </Configuration> 212 </Configuration>
212 <Configuration 213 <Configuration
213 Name="Release|Win32" 214 Name="Release|Win32"
214 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 215 OutputDirectory="$(SolutionDir)bin\"
215 IntermediateDirectory="$(ConfigurationName)" 216 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
216 ConfigurationType="2" 217 ConfigurationType="2"
217 CharacterSet="1" 218 CharacterSet="1"
218 WholeProgramOptimization="1" 219 WholeProgramOptimization="1"
@@ -300,8 +301,8 @@
300 </Configuration> 301 </Configuration>
301 <Configuration 302 <Configuration
302 Name="Release|x64" 303 Name="Release|x64"
303 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 304 OutputDirectory="$(SolutionDir)bin\"
304 IntermediateDirectory="$(ConfigurationName)" 305 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
305 ConfigurationType="2" 306 ConfigurationType="2"
306 CharacterSet="1" 307 CharacterSet="1"
307 WholeProgramOptimization="1" 308 WholeProgramOptimization="1"
diff --git a/scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj b/scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj
index 370c2cf..71edcff 100644
--- a/scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj
+++ b/scilab/modules/scicos/src/modelica_compiler/Modelicac.vcproj
@@ -1,10 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="Windows-1252"?>
2<VisualStudioProject 2<VisualStudioProject
3 ProjectType="Visual C++" 3 ProjectType="Visual C++"
4 Version="9,00" 4 Version="9,00"
5 Name="Modelicac" 5 Name="Modelicac"
6 ProjectGUID="{BB476641-07F4-488E-AA87-21795FFA8F4A}" 6 ProjectGUID="{BB476641-07F4-488E-AA87-21795FFA8F4A}"
7 Keyword="MakeFileProj" 7 Keyword="MakeFileProj"
8 TargetFrameworkVersion="0"
8 > 9 >
9 <Platforms> 10 <Platforms>
10 <Platform 11 <Platform
@@ -19,8 +20,8 @@
19 <Configurations> 20 <Configurations>
20 <Configuration 21 <Configuration
21 Name="Debug|Win32" 22 Name="Debug|Win32"
22 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 23 OutputDirectory="$(SolutionDir)bin\"
23 IntermediateDirectory="$(ConfigurationName)" 24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
24 ConfigurationType="0" 25 ConfigurationType="0"
25 > 26 >
26 <Tool 27 <Tool
@@ -39,8 +40,8 @@
39 </Configuration> 40 </Configuration>
40 <Configuration 41 <Configuration
41 Name="Debug|x64" 42 Name="Debug|x64"
42 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 43 OutputDirectory="$(SolutionDir)bin\"
43 IntermediateDirectory="$(ConfigurationName)" 44 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
44 ConfigurationType="0" 45 ConfigurationType="0"
45 > 46 >
46 <Tool 47 <Tool
@@ -59,8 +60,8 @@
59 </Configuration> 60 </Configuration>
60 <Configuration 61 <Configuration
61 Name="Release|Win32" 62 Name="Release|Win32"
62 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 63 OutputDirectory="$(SolutionDir)bin\"
63 IntermediateDirectory="$(ConfigurationName)" 64 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
64 ConfigurationType="0" 65 ConfigurationType="0"
65 > 66 >
66 <Tool 67 <Tool
@@ -79,8 +80,8 @@
79 </Configuration> 80 </Configuration>
80 <Configuration 81 <Configuration
81 Name="Release|x64" 82 Name="Release|x64"
82 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 83 OutputDirectory="$(SolutionDir)bin\"
83 IntermediateDirectory="$(ConfigurationName)" 84 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
84 ConfigurationType="0" 85 ConfigurationType="0"
85 > 86 >
86 <Tool 87 <Tool
diff --git a/scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj b/scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj
index b2822bc..6717d6f 100644
--- a/scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj
+++ b/scilab/modules/scicos/src/scicos_sundials/scicos_sundials.vcproj
@@ -21,8 +21,8 @@
21 <Configurations> 21 <Configurations>
22 <Configuration 22 <Configuration
23 Name="Debug|Win32" 23 Name="Debug|Win32"
24 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 24 OutputDirectory="$(SolutionDir)bin\"
25 IntermediateDirectory="$(ConfigurationName)" 25 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
26 ConfigurationType="2" 26 ConfigurationType="2"
27 CharacterSet="2" 27 CharacterSet="2"
28 > 28 >
@@ -106,8 +106,8 @@
106 </Configuration> 106 </Configuration>
107 <Configuration 107 <Configuration
108 Name="Debug|x64" 108 Name="Debug|x64"
109 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 109 OutputDirectory="$(SolutionDir)bin\"
110 IntermediateDirectory="$(ConfigurationName)" 110 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
111 ConfigurationType="2" 111 ConfigurationType="2"
112 CharacterSet="2" 112 CharacterSet="2"
113 > 113 >
@@ -191,8 +191,8 @@
191 </Configuration> 191 </Configuration>
192 <Configuration 192 <Configuration
193 Name="Release|Win32" 193 Name="Release|Win32"
194 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 194 OutputDirectory="$(SolutionDir)bin\"
195 IntermediateDirectory="$(ConfigurationName)" 195 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
196 ConfigurationType="2" 196 ConfigurationType="2"
197 CharacterSet="2" 197 CharacterSet="2"
198 WholeProgramOptimization="0" 198 WholeProgramOptimization="0"
@@ -282,8 +282,8 @@
282 </Configuration> 282 </Configuration>
283 <Configuration 283 <Configuration
284 Name="Release|x64" 284 Name="Release|x64"
285 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 285 OutputDirectory="$(SolutionDir)bin\"
286 IntermediateDirectory="$(ConfigurationName)" 286 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
287 ConfigurationType="2" 287 ConfigurationType="2"
288 CharacterSet="2" 288 CharacterSet="2"
289 WholeProgramOptimization="0" 289 WholeProgramOptimization="0"
diff --git a/scilab/modules/scicos/src/translator/translator.vcproj b/scilab/modules/scicos/src/translator/translator.vcproj
index 0692103..38b6249 100644
--- a/scilab/modules/scicos/src/translator/translator.vcproj
+++ b/scilab/modules/scicos/src/translator/translator.vcproj
@@ -20,8 +20,8 @@
20 <Configurations> 20 <Configurations>
21 <Configuration 21 <Configuration
22 Name="Debug|Win32" 22 Name="Debug|Win32"
23 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 23 OutputDirectory="$(SolutionDir)bin\"
24 IntermediateDirectory="$(ConfigurationName)" 24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
25 ConfigurationType="0" 25 ConfigurationType="0"
26 > 26 >
27 <Tool 27 <Tool
@@ -40,8 +40,8 @@
40 </Configuration> 40 </Configuration>
41 <Configuration 41 <Configuration
42 Name="Debug|x64" 42 Name="Debug|x64"
43 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 43 OutputDirectory="$(SolutionDir)bin\"
44 IntermediateDirectory="$(ConfigurationName)" 44 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
45 ConfigurationType="0" 45 ConfigurationType="0"
46 > 46 >
47 <Tool 47 <Tool
@@ -60,8 +60,8 @@
60 </Configuration> 60 </Configuration>
61 <Configuration 61 <Configuration
62 Name="Release|Win32" 62 Name="Release|Win32"
63 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 63 OutputDirectory="$(SolutionDir)bin\"
64 IntermediateDirectory="$(ConfigurationName)" 64 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
65 ConfigurationType="0" 65 ConfigurationType="0"
66 > 66 >
67 <Tool 67 <Tool
@@ -80,8 +80,8 @@
80 </Configuration> 80 </Configuration>
81 <Configuration 81 <Configuration
82 Name="Release|x64" 82 Name="Release|x64"
83 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 83 OutputDirectory="$(SolutionDir)bin\"
84 IntermediateDirectory="$(ConfigurationName)" 84 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
85 ConfigurationType="0" 85 ConfigurationType="0"
86 > 86 >
87 <Tool 87 <Tool
diff --git a/scilab/modules/scicos/src/xml2modelica/xml2modelica.vcproj b/scilab/modules/scicos/src/xml2modelica/xml2modelica.vcproj
index c097c5b..e4dab54 100644
--- a/scilab/modules/scicos/src/xml2modelica/xml2modelica.vcproj
+++ b/scilab/modules/scicos/src/xml2modelica/xml2modelica.vcproj
@@ -20,8 +20,8 @@
20 <Configurations> 20 <Configurations>
21 <Configuration 21 <Configuration
22 Name="Debug|Win32" 22 Name="Debug|Win32"
23 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 23 OutputDirectory="$(SolutionDir)bin\"
24 IntermediateDirectory="$(ConfigurationName)" 24 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
25 ConfigurationType="0" 25 ConfigurationType="0"
26 > 26 >
27 <Tool 27 <Tool
@@ -40,8 +40,8 @@
40 </Configuration> 40 </Configuration>
41 <Configuration 41 <Configuration
42 Name="Debug|x64" 42 Name="Debug|x64"
43 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 43 OutputDirectory="$(SolutionDir)bin\"
44 IntermediateDirectory="$(ConfigurationName)" 44 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
45 ConfigurationType="0" 45 ConfigurationType="0"
46 > 46 >
47 <Tool 47 <Tool
@@ -60,8 +60,8 @@
60 </Configuration> 60 </Configuration>
61 <Configuration 61 <Configuration
62 Name="Release|Win32" 62 Name="Release|Win32"
63 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 63 OutputDirectory="$(SolutionDir)bin\"
64 IntermediateDirectory="$(ConfigurationName)" 64 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
65 ConfigurationType="0" 65 ConfigurationType="0"
66 > 66 >
67 <Tool 67 <Tool
@@ -80,8 +80,8 @@
80 </Configuration> 80 </Configuration>
81 <Configuration 81 <Configuration
82 Name="Release|x64" 82 Name="Release|x64"
83 OutputDirectory="$(SolutionDir)$(ConfigurationName)" 83 OutputDirectory="$(SolutionDir)bin\"
84 IntermediateDirectory="$(ConfigurationName)" 84 IntermediateDirectory="$(ProjectDir)$(ConfigurationName)"
85 ConfigurationType="0" 85 ConfigurationType="0"
86 > 86 >
87 <Tool 87 <Tool