diff options
author | Allan CORNET <allan.cornet@scilab.org> | 2010-05-18 17:07:47 +0200 |
---|---|---|
committer | Pierre MARECHAL <pierre.marechal@scilab.org> | 2010-05-19 10:28:47 +0200 |
commit | 57f46d8f05649920505fcc86279833029f115c6c (patch) | |
tree | bfed3ac09a2ba5c118e2e9b85a481f26a2a5c180 /scilab/modules/data_structures | |
parent | 32fce17d94a24fa61a955d1bbce864bf56ff6f5a (diff) | |
download | scilab-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/data_structures')
3 files changed, 26 insertions, 23 deletions
diff --git a/scilab/modules/data_structures/src/c/data_structures.vcproj b/scilab/modules/data_structures/src/c/data_structures.vcproj index bd6a4c4..a6c2657 100644 --- a/scilab/modules/data_structures/src/c/data_structures.vcproj +++ b/scilab/modules/data_structures/src/c/data_structures.vcproj | |||
@@ -19,8 +19,8 @@ | |||
19 | <Configurations> | 19 | <Configurations> |
20 | <Configuration | 20 | <Configuration |
21 | Name="Debug|Win32" | 21 | Name="Debug|Win32" |
22 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 22 | OutputDirectory="$(SolutionDir)libs\" |
23 | IntermediateDirectory="$(ConfigurationName)" | 23 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
24 | ConfigurationType="4" | 24 | ConfigurationType="4" |
25 | UseOfMFC="0" | 25 | UseOfMFC="0" |
26 | ATLMinimizesCRunTimeLibraryUsage="false" | 26 | ATLMinimizesCRunTimeLibraryUsage="false" |
@@ -95,8 +95,8 @@ | |||
95 | </Configuration> | 95 | </Configuration> |
96 | <Configuration | 96 | <Configuration |
97 | Name="Debug|x64" | 97 | Name="Debug|x64" |
98 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 98 | OutputDirectory="$(SolutionDir)libs\" |
99 | IntermediateDirectory="$(ConfigurationName)" | 99 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
100 | ConfigurationType="4" | 100 | ConfigurationType="4" |
101 | UseOfMFC="0" | 101 | UseOfMFC="0" |
102 | ATLMinimizesCRunTimeLibraryUsage="false" | 102 | ATLMinimizesCRunTimeLibraryUsage="false" |
@@ -171,8 +171,8 @@ | |||
171 | </Configuration> | 171 | </Configuration> |
172 | <Configuration | 172 | <Configuration |
173 | Name="Release|Win32" | 173 | Name="Release|Win32" |
174 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 174 | OutputDirectory="$(SolutionDir)libs\" |
175 | IntermediateDirectory="$(ConfigurationName)" | 175 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
176 | ConfigurationType="4" | 176 | ConfigurationType="4" |
177 | UseOfMFC="0" | 177 | UseOfMFC="0" |
178 | ATLMinimizesCRunTimeLibraryUsage="false" | 178 | ATLMinimizesCRunTimeLibraryUsage="false" |
@@ -250,8 +250,8 @@ | |||
250 | </Configuration> | 250 | </Configuration> |
251 | <Configuration | 251 | <Configuration |
252 | Name="Release|x64" | 252 | Name="Release|x64" |
253 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 253 | OutputDirectory="$(SolutionDir)libs\" |
254 | IntermediateDirectory="$(ConfigurationName)" | 254 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
255 | ConfigurationType="4" | 255 | ConfigurationType="4" |
256 | UseOfMFC="0" | 256 | UseOfMFC="0" |
257 | ATLMinimizesCRunTimeLibraryUsage="false" | 257 | ATLMinimizesCRunTimeLibraryUsage="false" |
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 e5bb58d..c0e38f6 100644 --- a/scilab/modules/data_structures/src/fortran/data_structures_f.vfproj +++ b/scilab/modules/data_structures/src/fortran/data_structures_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;*.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="../../../../libs/data_structures_f.lib"/> |
10 | <Tool Name="VFResourceCompilerTool"/> | 10 | <Tool Name="VFResourceCompilerTool"/> |
@@ -19,7 +19,7 @@ copy data_structures_f.def ..\..\..\..\..\libs\data_structures_f.vcdef >nul | |||
19 | del *.def >nul | 19 | del *.def >nul |
20 | cd .."/> | 20 | cd .."/> |
21 | <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> | 21 | <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> |
22 | <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(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="../../../../libs/data_structures_f.lib"/> |
@@ -35,7 +35,7 @@ copy data_structures_f.def ..\..\..\..\..\libs\data_structures_f.vcdef >nul | |||
35 | del *.def >nul | 35 | del *.def >nul |
36 | cd .."/> | 36 | cd .."/> |
37 | <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> | 37 | <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> |
38 | <Configuration Name="Debug|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(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="../../../../libs/data_structures_f.lib"/> |
41 | <Tool Name="VFResourceCompilerTool"/> | 41 | <Tool Name="VFResourceCompilerTool"/> |
@@ -48,8 +48,9 @@ for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %% | |||
48 | copy *.def data_structures_f.def >nul | 48 | copy *.def data_structures_f.def >nul |
49 | copy data_structures_f.def ..\..\..\..\..\libs\data_structures_f.vcdef >nul | 49 | copy data_structures_f.def ..\..\..\..\..\libs\data_structures_f.vcdef >nul |
50 | del *.def >nul | 50 | del *.def >nul |
51 | cd .."/></Configuration> | 51 | cd .."/> |
52 | <Configuration Name="Release|x64" OutputDirectory="$(InputDir)$(ConfigurationName)" IntermediateDirectory="$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.lib;$(TargetPath)" ConfigurationType="typeStaticLibrary"> | 52 | <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"> | ||
53 | <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"/> |
54 | <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> | 55 | <Tool Name="VFLinkerTool" OutputFile="$(OutDir)/$(ProjectName)" SuppressStartupBanner="true"/> |
55 | <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/> | 56 | <Tool Name="VFLibrarianTool" OutputFile="../../../../libs/data_structures_f.lib"/> |
@@ -63,7 +64,8 @@ for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n scilex.dll %% | |||
63 | copy *.def data_structures_f.def >nul | 64 | copy *.def data_structures_f.def >nul |
64 | copy data_structures_f.def ..\..\..\..\..\libs\data_structures_f.vcdef >nul | 65 | copy data_structures_f.def ..\..\..\..\..\libs\data_structures_f.vcdef >nul |
65 | del *.def >nul | 66 | del *.def >nul |
66 | cd .."/></Configuration></Configurations> | 67 | cd .."/> |
68 | <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations> | ||
67 | <Files> | 69 | <Files> |
68 | <Filter Name="Header Files" Filter="fi;fd"/> | 70 | <Filter Name="Header Files" Filter="fi;fd"/> |
69 | <Filter Name="Library Dependencies"/> | 71 | <Filter Name="Library Dependencies"/> |
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 985e0b0..519d878 100644 --- a/scilab/modules/data_structures/src/fortran/data_structures_f2c.vcproj +++ b/scilab/modules/data_structures/src/fortran/data_structures_f2c.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="data_structures_f2c" | 5 | Name="data_structures_f2c" |
6 | ProjectGUID="{8091E9B6-4C08-4218-A63D-742867CCFE9F}" | 6 | ProjectGUID="{8091E9B6-4C08-4218-A63D-742867CCFE9F}" |
7 | RootNamespace="data_structures_f2c" | 7 | RootNamespace="data_structures_f2c" |
8 | TargetFrameworkVersion="0" | ||
8 | > | 9 | > |
9 | <Platforms> | 10 | <Platforms> |
10 | <Platform | 11 | <Platform |
@@ -22,8 +23,8 @@ | |||
22 | <Configurations> | 23 | <Configurations> |
23 | <Configuration | 24 | <Configuration |
24 | Name="Debug|Win32" | 25 | Name="Debug|Win32" |
25 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 26 | OutputDirectory="$(SolutionDir)libs\" |
26 | IntermediateDirectory="$(ConfigurationName)" | 27 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
27 | ConfigurationType="4" | 28 | ConfigurationType="4" |
28 | CharacterSet="2" | 29 | CharacterSet="2" |
29 | > | 30 | > |
@@ -105,8 +106,8 @@ | |||
105 | </Configuration> | 106 | </Configuration> |
106 | <Configuration | 107 | <Configuration |
107 | Name="Debug|x64" | 108 | Name="Debug|x64" |
108 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 109 | OutputDirectory="$(SolutionDir)libs\" |
109 | IntermediateDirectory="$(ConfigurationName)" | 110 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
110 | ConfigurationType="4" | 111 | ConfigurationType="4" |
111 | CharacterSet="2" | 112 | CharacterSet="2" |
112 | > | 113 | > |
@@ -175,8 +176,8 @@ | |||
175 | </Configuration> | 176 | </Configuration> |
176 | <Configuration | 177 | <Configuration |
177 | Name="Release|Win32" | 178 | Name="Release|Win32" |
178 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 179 | OutputDirectory="$(SolutionDir)libs\" |
179 | IntermediateDirectory="$(ConfigurationName)" | 180 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
180 | ConfigurationType="4" | 181 | ConfigurationType="4" |
181 | CharacterSet="2" | 182 | CharacterSet="2" |
182 | WholeProgramOptimization="1" | 183 | WholeProgramOptimization="1" |
@@ -257,8 +258,8 @@ | |||
257 | </Configuration> | 258 | </Configuration> |
258 | <Configuration | 259 | <Configuration |
259 | Name="Release|x64" | 260 | Name="Release|x64" |
260 | OutputDirectory="$(SolutionDir)$(ConfigurationName)" | 261 | OutputDirectory="$(SolutionDir)libs\" |
261 | IntermediateDirectory="$(ConfigurationName)" | 262 | IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" |
262 | ConfigurationType="4" | 263 | ConfigurationType="4" |
263 | CharacterSet="2" | 264 | CharacterSet="2" |
264 | WholeProgramOptimization="1" | 265 | WholeProgramOptimization="1" |