summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos_blocks
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/scicos_blocks
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/scicos_blocks')
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in4
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj4
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj4
3 files changed, 8 insertions, 4 deletions
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 15414d24..dc10f50 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -641,6 +641,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
641AWK = @AWK@ 641AWK = @AWK@
642BATIK = @BATIK@ 642BATIK = @BATIK@
643BLAS_LIBS = @BLAS_LIBS@ 643BLAS_LIBS = @BLAS_LIBS@
644BSH = @BSH@
644CC = @CC@ 645CC = @CC@
645CCDEPMODE = @CCDEPMODE@ 646CCDEPMODE = @CCDEPMODE@
646CFLAGS = @CFLAGS@ 647CFLAGS = @CFLAGS@
@@ -714,6 +715,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
714JOGL = @JOGL@ 715JOGL = @JOGL@
715JROSETTA_API = @JROSETTA_API@ 716JROSETTA_API = @JROSETTA_API@
716JROSETTA_ENGINE = @JROSETTA_ENGINE@ 717JROSETTA_ENGINE = @JROSETTA_ENGINE@
718JUNIT = @JUNIT@
717LAPACK_LIBS = @LAPACK_LIBS@ 719LAPACK_LIBS = @LAPACK_LIBS@
718LD = @LD@ 720LD = @LD@
719LDFLAGS = @LDFLAGS@ 721LDFLAGS = @LDFLAGS@
@@ -770,6 +772,7 @@ PVM_ENABLE = @PVM_ENABLE@
770PVM_INCLUDE = @PVM_INCLUDE@ 772PVM_INCLUDE = @PVM_INCLUDE@
771PVM_LIB = @PVM_LIB@ 773PVM_LIB = @PVM_LIB@
772PYTHON = @PYTHON@ 774PYTHON = @PYTHON@
775QDOX = @QDOX@
773RANLIB = @RANLIB@ 776RANLIB = @RANLIB@
774RELOCATABLE = @RELOCATABLE@ 777RELOCATABLE = @RELOCATABLE@
775RT_LIB = @RT_LIB@ 778RT_LIB = @RT_LIB@
@@ -788,6 +791,7 @@ SWIG_JAVA = @SWIG_JAVA@
788SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 791SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
789TCLTK_LIBS = @TCLTK_LIBS@ 792TCLTK_LIBS = @TCLTK_LIBS@
790TCL_INC_PATH = @TCL_INC_PATH@ 793TCL_INC_PATH = @TCL_INC_PATH@
794TESTNG = @TESTNG@
791TK_INC_PATH = @TK_INC_PATH@ 795TK_INC_PATH = @TK_INC_PATH@
792UMFPACK_ENABLE = @UMFPACK_ENABLE@ 796UMFPACK_ENABLE = @UMFPACK_ENABLE@
793UMFPACK_LIB = @UMFPACK_LIB@ 797UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj b/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
index c4149e4..4d6ec76 100644
--- a/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
+++ b/scilab/modules/scicos_blocks/src/c/scicos_blocks.vcproj
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes" 48 AdditionalIncludeDirectories="../../includes;../../src/c;../../../../libs/MALLOC/includes;../../../../libs/dynamiclibrary/includes;../../../output_stream/includes;../../../localization/includes;../../../graphics/includes;../../../scicos/includes;../../../core/includes;../../../renderer/includes;../../../elementary_functions/includes;../../../../libs/hashtable;../../../../libs/doublylinkedlist/includes;../../../../libs/intl;../../../windows_tools/includes;../../../jvm/includes;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../fileio/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;SCICOS_BLOCKS_EXPORTS"
@@ -212,7 +212,7 @@
212 /> 212 />
213 <Tool 213 <Tool
214 Name="VCCLCompilerTool" 214 Name="VCCLCompilerTool"
215 AdditionalOptions="/arch:IA32" 215 AdditionalOptions=""
216 InlineFunctionExpansion="1" 216 InlineFunctionExpansion="1"
217 FavorSizeOrSpeed="1" 217 FavorSizeOrSpeed="1"
218 WholeProgramOptimization="false" 218 WholeProgramOptimization="false"
diff --git a/scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj b/scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj
index 44ce461..840cb33 100644
--- a/scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj
+++ b/scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj
@@ -5,7 +5,7 @@
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" AdditionalOptions="/arch:IA32" 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" AdditionalOptions="" 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_blocks_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_blocks_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib string.lib scicos_f.lib scicos.lib scicos_blocks.lib"/> 9 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_blocks_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_blocks_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib string.lib scicos_f.lib scicos.lib scicos_blocks.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"/>
@@ -26,7 +26,7 @@ lib /DEF:&quot;$(InputDir)Scicos_blocks_Import.def&quot; /SUBSYSTEM:WINDOWS /MAC
26 <Tool Name="VFPostBuildEventTool"/> 26 <Tool Name="VFPostBuildEventTool"/>
27 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration> 27 <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
28 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary"> 28 <Configuration Name="Release|Win32" OutputDirectory="$(InputDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
29 <Tool Name="VFFortranCompilerTool" AdditionalOptions="/arch:IA32" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/> 29 <Tool Name="VFFortranCompilerTool" AdditionalOptions="" SuppressStartupBanner="true" AdditionalIncludeDirectories="../../../core/includes" PreprocessorDefinitions="WIN32;FORDLL" AlternateParameterSyntax="false" F77RuntimeCompatibility="true" FPS4Libs="false" CallingConvention="callConventionCRef" ExternalNameUnderscore="true" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" RuntimeLibrary="rtMultiThreadedDLL"/>
30 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_blocks_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_blocks_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib string.lib scicos_f.lib scicos.lib scicos_blocks.lib"/> 30 <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\scicos_blocks_f.dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\scicos_blocks_f.lib" LinkDLL="true" AdditionalDependencies="LibScilab.lib output_stream.lib string.lib scicos_f.lib scicos.lib scicos_blocks.lib"/>
31 <Tool Name="VFResourceCompilerTool"/> 31 <Tool Name="VFResourceCompilerTool"/>
32 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/> 32 <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>