summaryrefslogtreecommitdiffstats
path: root/scilab/modules/metanet
diff options
context:
space:
mode:
authorBruno JOFRET <bruno.jofret@scilab.org>2009-10-13 07:59:13 +0200
committerBruno JOFRET <bruno.jofret@scilab.org>2009-10-13 07:59:13 +0200
commit207c7efa93c963d649edd4fae59e9042b797ede2 (patch)
tree026b7e67dac39e9ebaf1de841cffcd7aafd2d798 /scilab/modules/metanet
parentfc9d356d7284a31be08db988f5cc3890f07066a0 (diff)
parent74fc613637d103096cac92c7017a9c14540c6e04 (diff)
downloadscilab-207c7efa93c963d649edd4fae59e9042b797ede2.zip
scilab-207c7efa93c963d649edd4fae59e9042b797ede2.tar.gz
Merge commit 'origin/master' into Xcos
Diffstat (limited to 'scilab/modules/metanet')
-rw-r--r--scilab/modules/metanet/src/fortran/metanet_f.vfproj6
1 files changed, 3 insertions, 3 deletions
diff --git a/scilab/modules/metanet/src/fortran/metanet_f.vfproj b/scilab/modules/metanet/src/fortran/metanet_f.vfproj
index 1ac0ebe..c3c120a 100644
--- a/scilab/modules/metanet/src/fortran/metanet_f.vfproj
+++ b/scilab/modules/metanet/src/fortran/metanet_f.vfproj
@@ -1,11 +1,11 @@
1<?xml version="1.0" encoding="UTF-8"?> 1<?xml version="1.0" encoding="UTF-8"?>
2<VisualStudioProject ProjectType="typeDynamicLibrary" ProjectCreator="Intel Fortran" Keyword="Dll" Version="9.10" ProjectIdGuid="{1D5E735D-176E-4C6D-B980-3C2EC7051F90}"> 2<VisualStudioProject ProjectType="typeDynamicLibrary" ProjectCreator="Intel Fortran" Keyword="Dll" Version="11.0" ProjectIdGuid="{1D5E735D-176E-4C6D-B980-3C2EC7051F90}">
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="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 7 <Configuration Name="Debug|Win32" OutputDirectory="$(InputDir)$(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" OptimizeForProcessor="procOptimizePentiumProThruIII" 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\metanet_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="metanet_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\metanet_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib metanet.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\metanet_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="metanet_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\metanet_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib metanet.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"/>
@@ -21,7 +21,7 @@ copy metanet_f_header.def+metanet_f.vcdef metanet_f.def &gt;nul" Description="Bu
21lib /DEF:&quot;$(InputDir)metanet_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)metanet.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/> 21lib /DEF:&quot;$(InputDir)metanet_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)metanet.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
22 <Tool Name="VFPostBuildEventTool"/></Configuration> 22 <Tool Name="VFPostBuildEventTool"/></Configuration>
23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 23 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
24 <Tool Name="VFFortranCompilerTool" SuppressStartupBanner="true" OptimizeForProcessor="procOptimizePentiumProThruIII" 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="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="VFLinkerTool" OutputFile="$(SolutionDir)bin\metanet_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="metanet_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\metanet_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib metanet.lib"/> 25 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\metanet_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="metanet_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\metanet_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib metanet.lib"/>
26 <Tool Name="VFResourceCompilerTool"/> 26 <Tool Name="VFResourceCompilerTool"/>
27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 27 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>