summaryrefslogtreecommitdiffstats
path: root/scilab/modules/data_structures
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/data_structures
parentbcb0dc85d211d0339cbb1a954974bdcc163d0a0c (diff)
downloadscilab-f06b8a6995add91d1c479628fe91a3901f832476.zip
scilab-f06b8a6995add91d1c479628fe91a3901f832476.tar.gz
build scilab x64 with VS 2010 (compatibility)
Change-Id: Id71a4012699bef52930cf43bef0352eb7635dcd5
Diffstat (limited to 'scilab/modules/data_structures')
-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
3 files changed, 16 insertions, 36 deletions
diff --git a/scilab/modules/data_structures/src/c/data_structures.vcproj b/scilab/modules/data_structures/src/c/data_structures.vcproj
index 1a67642..fc2b057 100644
--- a/scilab/modules/data_structures/src/c/data_structures.vcproj
+++ b/scilab/modules/data_structures/src/c/data_structures.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/data_structures.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/data_structures.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/data_structures.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/data_structures.lib" 294 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
303 SuppressStartupBanner="true" 295 SuppressStartupBanner="true"
304 /> 296 />
305 <Tool 297 <Tool
diff --git a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj b/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
index c0e38f6..c7bb84c 100644
--- a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj
+++ b/scilab/modules/data_structures/src/fortran/data_structures_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/data_structures_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" Optimization="optimizeMinSpace" 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" Optimization="optimizeMinSpace" 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/data_structures_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/data_structures_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" Optimization="optimizeMinSpace" 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" Optimization="optimizeMinSpace" 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/data_structures_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/data_structures/src/fortran/data_structures_f2c.vcproj b/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj
index 29e8a02d..e2af4ce 100644
--- a/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj
+++ b/scilab/modules/data_structures/src/fortran/data_structures_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"
@@ -39,10 +39,7 @@
39 <Tool 39 <Tool
40 Name="VCCustomBuildTool" 40 Name="VCCustomBuildTool"
41 /> 41 />
42 <Tool 42
43 Name="VCWebServiceProxyGeneratorTool"
44 ExecutionBucket="4"
45 />
46 <Tool 43 <Tool
47 Name="VCXMLDataGeneratorTool" 44 Name="VCXMLDataGeneratorTool"
48 /> 45 />
@@ -61,7 +58,6 @@
61 RuntimeLibrary="3" 58 RuntimeLibrary="3"
62 UsePrecompiledHeader="0" 59 UsePrecompiledHeader="0"
63 WarningLevel="3" 60 WarningLevel="3"
64
65 DebugInformationFormat="3" 61 DebugInformationFormat="3"
66 /> 62 />
67 <Tool 63 <Tool
@@ -79,7 +75,7 @@
79 <Tool 75 <Tool
80 Name="VCLibrarianTool" 76 Name="VCLibrarianTool"
81 ExecutionBucket="10" 77 ExecutionBucket="10"
82 OutputFile="../../../../libs/data_structures_f.lib" 78 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
83 /> 79 />
84 <Tool 80 <Tool
85 Name="VCALinkTool" 81 Name="VCALinkTool"
@@ -123,7 +119,6 @@
123 <Tool 119 <Tool
124 Name="VCXMLDataGeneratorTool" 120 Name="VCXMLDataGeneratorTool"
125 /> 121 />
126
127 <Tool 122 <Tool
128 Name="VCMIDLTool" 123 Name="VCMIDLTool"
129 TargetEnvironment="3" 124 TargetEnvironment="3"
@@ -138,7 +133,6 @@
138 RuntimeLibrary="3" 133 RuntimeLibrary="3"
139 UsePrecompiledHeader="0" 134 UsePrecompiledHeader="0"
140 WarningLevel="3" 135 WarningLevel="3"
141
142 DebugInformationFormat="3" 136 DebugInformationFormat="3"
143 /> 137 />
144 <Tool 138 <Tool
@@ -152,7 +146,7 @@
152 /> 146 />
153 <Tool 147 <Tool
154 Name="VCLibrarianTool" 148 Name="VCLibrarianTool"
155 OutputFile="../../../../libs/data_structures_f.lib" 149 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
156 /> 150 />
157 <Tool 151 <Tool
158 Name="VCALinkTool" 152 Name="VCALinkTool"
@@ -191,10 +185,7 @@
191 <Tool 185 <Tool
192 Name="VCCustomBuildTool" 186 Name="VCCustomBuildTool"
193 /> 187 />
194 <Tool 188
195 Name="VCWebServiceProxyGeneratorTool"
196 ExecutionBucket="4"
197 />
198 <Tool 189 <Tool
199 Name="VCXMLDataGeneratorTool" 190 Name="VCXMLDataGeneratorTool"
200 /> 191 />
@@ -211,7 +202,6 @@
211 RuntimeLibrary="2" 202 RuntimeLibrary="2"
212 UsePrecompiledHeader="0" 203 UsePrecompiledHeader="0"
213 WarningLevel="3" 204 WarningLevel="3"
214
215 DebugInformationFormat="3" 205 DebugInformationFormat="3"
216 /> 206 />
217 <Tool 207 <Tool
@@ -229,7 +219,7 @@
229 <Tool 219 <Tool
230 Name="VCLibrarianTool" 220 Name="VCLibrarianTool"
231 ExecutionBucket="10" 221 ExecutionBucket="10"
232 OutputFile="../../../../libs/data_structures_f.lib" 222 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
233 /> 223 />
234 <Tool 224 <Tool
235 Name="VCALinkTool" 225 Name="VCALinkTool"
@@ -274,7 +264,6 @@
274 <Tool 264 <Tool
275 Name="VCXMLDataGeneratorTool" 265 Name="VCXMLDataGeneratorTool"
276 /> 266 />
277
278 <Tool 267 <Tool
279 Name="VCMIDLTool" 268 Name="VCMIDLTool"
280 TargetEnvironment="3" 269 TargetEnvironment="3"
@@ -287,7 +276,6 @@
287 RuntimeLibrary="2" 276 RuntimeLibrary="2"
288 UsePrecompiledHeader="0" 277 UsePrecompiledHeader="0"
289 WarningLevel="3" 278 WarningLevel="3"
290
291 DebugInformationFormat="3" 279 DebugInformationFormat="3"
292 /> 280 />
293 <Tool 281 <Tool
@@ -301,7 +289,7 @@
301 /> 289 />
302 <Tool 290 <Tool
303 Name="VCLibrarianTool" 291 Name="VCLibrarianTool"
304 OutputFile="../../../../libs/data_structures_f.lib" 292 OutputFile="$(SolutionDir)libs\$(ProjectName).lib"
305 /> 293 />
306 <Tool 294 <Tool
307 Name="VCALinkTool" 295 Name="VCALinkTool"