diff options
author | Sylvestre Ledru <sylvestre.ledru@scilab-enterprises.com> | 2012-07-20 02:13:53 +0200 |
---|---|---|
committer | Antoine ELIAS <antoine.elias@scilab-enterprises.com> | 2012-07-23 10:49:16 +0200 |
commit | 7d063e7b729ed084a94212d7bab00f3205d12a0a (patch) | |
tree | 6fbeec74be1998da331980c0d9958b66c37fae49 /scilab/modules/intersci/src/lib | |
parent | c7ae2f028b18d17a0d47b44f6e48803334a1cd5b (diff) | |
download | scilab-7d063e7b729ed084a94212d7bab00f3205d12a0a.zip scilab-7d063e7b729ed084a94212d7bab00f3205d12a0a.tar.gz |
Get ride of intersci.
It has been deprecated for a while
Change-Id: I1812e6e5f6a6a320747d4cf50d2ea5306ce5852d
Diffstat (limited to 'scilab/modules/intersci/src/lib')
-rw-r--r-- | scilab/modules/intersci/src/lib/cdoublef.c | 31 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/core_Import.def | 7 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/cout.c | 23 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/intersci.rc | 97 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/intersci.vcxproj | 226 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/intersci.vcxproj.filters | 59 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/libinter.c | 356 | ||||
-rw-r--r-- | scilab/modules/intersci/src/lib/out.c | 28 |
8 files changed, 0 insertions, 827 deletions
diff --git a/scilab/modules/intersci/src/lib/cdoublef.c b/scilab/modules/intersci/src/lib/cdoublef.c deleted file mode 100644 index fa79ac1..0000000 --- a/scilab/modules/intersci/src/lib/cdoublef.c +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
3 | * Copyright (C) ????-2008 - INRIA | ||
4 | * | ||
5 | * This file must be used under the terms of the CeCILL. | ||
6 | * This source file is licensed as described in the file COPYING, which | ||
7 | * you should have received as part of this distribution. The terms | ||
8 | * are also available at | ||
9 | * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | |||
14 | /* ip is a pointer to a FORTRAN variable coming from SCILAB | ||
15 | which is itself a pointer to an array of n doubles typically | ||
16 | coming from a C function | ||
17 | cdoublef converts this double array into a double array in op | ||
18 | moreover, pointer ip is freed */ | ||
19 | |||
20 | void C2F(cdoublef)(n,ip,op) | ||
21 | int *n; | ||
22 | double *ip[]; | ||
23 | double *op; | ||
24 | { | ||
25 | int i; | ||
26 | if ( *n >0 ) { | ||
27 | for (i = 0; i < *n; i++) | ||
28 | op[i]=(*ip)[i]; | ||
29 | free((char *)(*ip)); | ||
30 | } | ||
31 | } | ||
diff --git a/scilab/modules/intersci/src/lib/core_Import.def b/scilab/modules/intersci/src/lib/core_Import.def deleted file mode 100644 index c2fc077..0000000 --- a/scilab/modules/intersci/src/lib/core_Import.def +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | LIBRARY core.dll | ||
2 | |||
3 | |||
4 | EXPORTS | ||
5 | ; core | ||
6 | iop_ | ||
7 | |||
diff --git a/scilab/modules/intersci/src/lib/cout.c b/scilab/modules/intersci/src/lib/cout.c deleted file mode 100644 index aee734c..0000000 --- a/scilab/modules/intersci/src/lib/cout.c +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | /* | ||
2 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
3 | * Copyright (C) ????-2008 - INRIA | ||
4 | * | ||
5 | * This file must be used under the terms of the CeCILL. | ||
6 | * This source file is licensed as described in the file COPYING, which | ||
7 | * you should have received as part of this distribution. The terms | ||
8 | * are also available at | ||
9 | * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | #include <string.h> | ||
14 | |||
15 | extern void C2F(out)(); | ||
16 | |||
17 | void Cout(str) | ||
18 | char *str; | ||
19 | { | ||
20 | int l; | ||
21 | l = strlen(str) + 1; | ||
22 | C2F(out)(str,l); | ||
23 | } | ||
diff --git a/scilab/modules/intersci/src/lib/intersci.rc b/scilab/modules/intersci/src/lib/intersci.rc deleted file mode 100644 index 39b0c76..0000000 --- a/scilab/modules/intersci/src/lib/intersci.rc +++ /dev/null | |||
@@ -1,97 +0,0 @@ | |||
1 | // Microsoft Visual C++ generated resource script. | ||
2 | // | ||
3 | |||
4 | |||
5 | #define APSTUDIO_READONLY_SYMBOLS | ||
6 | ///////////////////////////////////////////////////////////////////////////// | ||
7 | // | ||
8 | // Generated from the TEXTINCLUDE 2 resource. | ||
9 | // | ||
10 | //#include "afxres.h" | ||
11 | #define APSTUDIO_HIDDEN_SYMBOLS | ||
12 | #include "windows.h" | ||
13 | ///////////////////////////////////////////////////////////////////////////// | ||
14 | #undef APSTUDIO_READONLY_SYMBOLS | ||
15 | |||
16 | ///////////////////////////////////////////////////////////////////////////// | ||
17 | // French (France) resources | ||
18 | |||
19 | #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA) | ||
20 | #ifdef _WIN32 | ||
21 | LANGUAGE LANG_FRENCH, SUBLANG_FRENCH | ||
22 | #pragma code_page(1252) | ||
23 | #endif //_WIN32 | ||
24 | |||
25 | #ifdef APSTUDIO_INVOKED | ||
26 | ///////////////////////////////////////////////////////////////////////////// | ||
27 | // | ||
28 | // TEXTINCLUDE | ||
29 | // | ||
30 | |||
31 | 1 TEXTINCLUDE | ||
32 | BEGIN | ||
33 | "resource.h\0" | ||
34 | END | ||
35 | |||
36 | |||
37 | 3 TEXTINCLUDE | ||
38 | BEGIN | ||
39 | "\r\n" | ||
40 | "\0" | ||
41 | END | ||
42 | |||
43 | #endif // APSTUDIO_INVOKED | ||
44 | |||
45 | |||
46 | ///////////////////////////////////////////////////////////////////////////// | ||
47 | // | ||
48 | // Version | ||
49 | // | ||
50 | |||
51 | VS_VERSION_INFO VERSIONINFO | ||
52 | FILEVERSION 6,0,0,0 | ||
53 | PRODUCTVERSION 6,0,0,0 | ||
54 | FILEFLAGSMASK 0x17L | ||
55 | #ifdef _DEBUG | ||
56 | FILEFLAGS 0x1L | ||
57 | #else | ||
58 | FILEFLAGS 0x0L | ||
59 | #endif | ||
60 | FILEOS 0x4L | ||
61 | FILETYPE 0x0L | ||
62 | FILESUBTYPE 0x0L | ||
63 | BEGIN | ||
64 | BLOCK "StringFileInfo" | ||
65 | BEGIN | ||
66 | BLOCK "040c04b0" | ||
67 | BEGIN | ||
68 | VALUE "FileDescription", "intersci module" | ||
69 | VALUE "FileVersion", "6, 0, 0, 0" | ||
70 | VALUE "InternalName", "intersci module" | ||
71 | VALUE "LegalCopyright", "Copyright (C) 2012" | ||
72 | VALUE "OriginalFilename", "intersci.dll" | ||
73 | VALUE "ProductName", " intersci" | ||
74 | VALUE "ProductVersion", "6, 0, 0, 0" | ||
75 | END | ||
76 | END | ||
77 | BLOCK "VarFileInfo" | ||
78 | BEGIN | ||
79 | VALUE "Translation", 0x40c, 1200 | ||
80 | END | ||
81 | END | ||
82 | |||
83 | #endif // French (France) resources | ||
84 | ///////////////////////////////////////////////////////////////////////////// | ||
85 | |||
86 | |||
87 | |||
88 | #ifndef APSTUDIO_INVOKED | ||
89 | ///////////////////////////////////////////////////////////////////////////// | ||
90 | // | ||
91 | // Generated from the TEXTINCLUDE 3 resource. | ||
92 | // | ||
93 | |||
94 | |||
95 | ///////////////////////////////////////////////////////////////////////////// | ||
96 | #endif // not APSTUDIO_INVOKED | ||
97 | |||
diff --git a/scilab/modules/intersci/src/lib/intersci.vcxproj b/scilab/modules/intersci/src/lib/intersci.vcxproj deleted file mode 100644 index 2b16251..0000000 --- a/scilab/modules/intersci/src/lib/intersci.vcxproj +++ /dev/null | |||
@@ -1,226 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <ItemGroup Label="ProjectConfigurations"> | ||
4 | <ProjectConfiguration Include="Debug|Win32"> | ||
5 | <Configuration>Debug</Configuration> | ||
6 | <Platform>Win32</Platform> | ||
7 | </ProjectConfiguration> | ||
8 | <ProjectConfiguration Include="Debug|x64"> | ||
9 | <Configuration>Debug</Configuration> | ||
10 | <Platform>x64</Platform> | ||
11 | </ProjectConfiguration> | ||
12 | <ProjectConfiguration Include="Release|Win32"> | ||
13 | <Configuration>Release</Configuration> | ||
14 | <Platform>Win32</Platform> | ||
15 | </ProjectConfiguration> | ||
16 | <ProjectConfiguration Include="Release|x64"> | ||
17 | <Configuration>Release</Configuration> | ||
18 | <Platform>x64</Platform> | ||
19 | </ProjectConfiguration> | ||
20 | </ItemGroup> | ||
21 | <PropertyGroup Label="Globals"> | ||
22 | <ProjectGuid>{DFA0D75B-F7EF-4D02-B33F-486829405315}</ProjectGuid> | ||
23 | <RootNamespace>intersci</RootNamespace> | ||
24 | <Keyword>Win32Proj</Keyword> | ||
25 | </PropertyGroup> | ||
26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
27 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
28 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
29 | <CharacterSet>MultiByte</CharacterSet> | ||
30 | <WholeProgramOptimization>false</WholeProgramOptimization> | ||
31 | </PropertyGroup> | ||
32 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
33 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
34 | <CharacterSet>MultiByte</CharacterSet> | ||
35 | </PropertyGroup> | ||
36 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
37 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
38 | <CharacterSet>MultiByte</CharacterSet> | ||
39 | <WholeProgramOptimization>false</WholeProgramOptimization> | ||
40 | </PropertyGroup> | ||
41 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
42 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
43 | <CharacterSet>MultiByte</CharacterSet> | ||
44 | </PropertyGroup> | ||
45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
46 | <ImportGroup Label="ExtensionSettings"> | ||
47 | </ImportGroup> | ||
48 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
49 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
50 | </ImportGroup> | ||
51 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
52 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
53 | </ImportGroup> | ||
54 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
55 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
56 | </ImportGroup> | ||
57 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
58 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
59 | </ImportGroup> | ||
60 | <PropertyGroup Label="UserMacros" /> | ||
61 | <PropertyGroup> | ||
62 | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | ||
63 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir> | ||
64 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir> | ||
65 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</LinkIncremental> | ||
66 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir> | ||
67 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir> | ||
68 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</LinkIncremental> | ||
69 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir> | ||
70 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir> | ||
71 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> | ||
72 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir> | ||
73 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir> | ||
74 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> | ||
75 | </PropertyGroup> | ||
76 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
77 | <ClCompile> | ||
78 | <Optimization>Disabled</Optimization> | ||
79 | <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
80 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
81 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
82 | <WarningLevel>Level3</WarningLevel> | ||
83 | </ClCompile> | ||
84 | <PreLinkEvent> | ||
85 | <Message>Make dependencies</Message> | ||
86 | <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1>NUL 2>NUL | ||
87 | </Command> | ||
88 | </PreLinkEvent> | ||
89 | <Link> | ||
90 | <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
91 | <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile> | ||
92 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
93 | <SubSystem>Windows</SubSystem> | ||
94 | <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary> | ||
95 | <TargetMachine>MachineX86</TargetMachine> | ||
96 | <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck> | ||
97 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
98 | </Link> | ||
99 | </ItemDefinitionGroup> | ||
100 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
101 | <Midl> | ||
102 | <TargetEnvironment>X64</TargetEnvironment> | ||
103 | </Midl> | ||
104 | <ClCompile> | ||
105 | <Optimization>Disabled</Optimization> | ||
106 | <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
107 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
108 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
109 | <WarningLevel>Level3</WarningLevel> | ||
110 | </ClCompile> | ||
111 | <PreLinkEvent> | ||
112 | <Message>Make dependencies</Message> | ||
113 | <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1>NUL 2>NUL | ||
114 | </Command> | ||
115 | </PreLinkEvent> | ||
116 | <Link> | ||
117 | <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
118 | <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile> | ||
119 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
120 | <SubSystem>Windows</SubSystem> | ||
121 | <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary> | ||
122 | <TargetMachine>MachineX64</TargetMachine> | ||
123 | <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck> | ||
124 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
125 | </Link> | ||
126 | </ItemDefinitionGroup> | ||
127 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
128 | <ClCompile> | ||
129 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | ||
130 | <WholeProgramOptimization>false</WholeProgramOptimization> | ||
131 | <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
132 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
133 | <StringPooling>true</StringPooling> | ||
134 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
135 | <WarningLevel>Level3</WarningLevel> | ||
136 | <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||
137 | </ClCompile> | ||
138 | <PreLinkEvent> | ||
139 | <Message>Make dependencies</Message> | ||
140 | <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1>NUL 2>NUL | ||
141 | </Command> | ||
142 | </PreLinkEvent> | ||
143 | <Link> | ||
144 | <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
145 | <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile> | ||
146 | <GenerateDebugInformation>false</GenerateDebugInformation> | ||
147 | <SubSystem>Windows</SubSystem> | ||
148 | <OptimizeReferences>true</OptimizeReferences> | ||
149 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
150 | <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary> | ||
151 | <TargetMachine>MachineX86</TargetMachine> | ||
152 | <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck> | ||
153 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
154 | </Link> | ||
155 | </ItemDefinitionGroup> | ||
156 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
157 | <Midl> | ||
158 | <TargetEnvironment>X64</TargetEnvironment> | ||
159 | </Midl> | ||
160 | <ClCompile> | ||
161 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | ||
162 | <WholeProgramOptimization>false</WholeProgramOptimization> | ||
163 | <AdditionalIncludeDirectories>../../includes;../../../core/includes;../../../string/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
164 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERSCI_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
165 | <StringPooling>true</StringPooling> | ||
166 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
167 | <WarningLevel>Level3</WarningLevel> | ||
168 | <MultiProcessorCompilation>true</MultiProcessorCompilation> | ||
169 | </ClCompile> | ||
170 | <PreLinkEvent> | ||
171 | <Message>Make dependencies</Message> | ||
172 | <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1>NUL 2>NUL | ||
173 | </Command> | ||
174 | </PreLinkEvent> | ||
175 | <Link> | ||
176 | <AdditionalDependencies>core.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
177 | <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile> | ||
178 | <GenerateDebugInformation>false</GenerateDebugInformation> | ||
179 | <SubSystem>Windows</SubSystem> | ||
180 | <OptimizeReferences>true</OptimizeReferences> | ||
181 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
182 | <ImportLibrary>$(SolutionDir)bin\$(ProjectName).lib</ImportLibrary> | ||
183 | <TargetMachine>MachineX64</TargetMachine> | ||
184 | <CLRUnmanagedCodeCheck>true</CLRUnmanagedCodeCheck> | ||
185 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
186 | </Link> | ||
187 | </ItemDefinitionGroup> | ||
188 | <ItemGroup> | ||
189 | <ClCompile Include="libinter.c" /> | ||
190 | <ClCompile Include="out.c" /> | ||
191 | </ItemGroup> | ||
192 | <ItemGroup> | ||
193 | <ClInclude Include="..\..\includes\dynlib_intersci.h" /> | ||
194 | <ClInclude Include="..\..\includes\libinter.h" /> | ||
195 | </ItemGroup> | ||
196 | <ItemGroup> | ||
197 | <ResourceCompile Include="intersci.rc" /> | ||
198 | </ItemGroup> | ||
199 | <ItemGroup> | ||
200 | <None Include="..\..\locales\intersci.pot" /> | ||
201 | <None Include="intersci_header.def" /> | ||
202 | <None Include="core_import.def" /> | ||
203 | <None Include="..\..\intersci.iss" /> | ||
204 | </ItemGroup> | ||
205 | <ItemGroup> | ||
206 | <ProjectReference Include="..\..\..\..\libs\MALLOC\MALLOC.vcxproj"> | ||
207 | <Project>{6a84ad8c-ba18-4a3f-9c72-ec3df0939e9e}</Project> | ||
208 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
209 | </ProjectReference> | ||
210 | <ProjectReference Include="..\..\..\..\tools\Dumpexts\Dumpexts.vcxproj"> | ||
211 | <Project>{3170e4c2-1173-4264-a222-7ee8ccb3ddf7}</Project> | ||
212 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
213 | </ProjectReference> | ||
214 | <ProjectReference Include="..\..\..\output_stream\src\c\output_stream.vcxproj"> | ||
215 | <Project>{a5911cd7-f8e8-440c-a23e-4843a0636f3a}</Project> | ||
216 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
217 | </ProjectReference> | ||
218 | <ProjectReference Include="..\..\..\string\src\c\string.vcxproj"> | ||
219 | <Project>{8d45767a-9b03-4905-97f6-d2f3f79141ea}</Project> | ||
220 | <ReferenceOutputAssembly>false</ReferenceOutputAssembly> | ||
221 | </ProjectReference> | ||
222 | </ItemGroup> | ||
223 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
224 | <ImportGroup Label="ExtensionTargets"> | ||
225 | </ImportGroup> | ||
226 | </Project> \ No newline at end of file | ||
diff --git a/scilab/modules/intersci/src/lib/intersci.vcxproj.filters b/scilab/modules/intersci/src/lib/intersci.vcxproj.filters deleted file mode 100644 index 7ae34d6..0000000 --- a/scilab/modules/intersci/src/lib/intersci.vcxproj.filters +++ /dev/null | |||
@@ -1,59 +0,0 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | ||
2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
3 | <ItemGroup> | ||
4 | <Filter Include="Source Files"> | ||
5 | <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> | ||
6 | <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> | ||
7 | </Filter> | ||
8 | <Filter Include="Header Files"> | ||
9 | <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> | ||
10 | <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions> | ||
11 | </Filter> | ||
12 | <Filter Include="Resource Files"> | ||
13 | <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> | ||
14 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions> | ||
15 | </Filter> | ||
16 | <Filter Include="localization"> | ||
17 | <UniqueIdentifier>{16104ac4-9910-457a-bd43-f47876214c50}</UniqueIdentifier> | ||
18 | </Filter> | ||
19 | <Filter Include="Libraries Dependencies"> | ||
20 | <UniqueIdentifier>{7025e65f-3c83-4dd7-9460-aea44fd70bf4}</UniqueIdentifier> | ||
21 | </Filter> | ||
22 | <Filter Include="Libraries Dependencies\Imports"> | ||
23 | <UniqueIdentifier>{4599ee07-7f85-465f-ae1a-9c6e33a7ef74}</UniqueIdentifier> | ||
24 | </Filter> | ||
25 | </ItemGroup> | ||
26 | <ItemGroup> | ||
27 | <ClCompile Include="libinter.c"> | ||
28 | <Filter>Source Files</Filter> | ||
29 | </ClCompile> | ||
30 | <ClCompile Include="out.c"> | ||
31 | <Filter>Source Files</Filter> | ||
32 | </ClCompile> | ||
33 | </ItemGroup> | ||
34 | <ItemGroup> | ||
35 | <ClInclude Include="..\..\includes\dynlib_intersci.h"> | ||
36 | <Filter>Header Files</Filter> | ||
37 | </ClInclude> | ||
38 | <ClInclude Include="..\..\includes\libinter.h"> | ||
39 | <Filter>Header Files</Filter> | ||
40 | </ClInclude> | ||
41 | </ItemGroup> | ||
42 | <ItemGroup> | ||
43 | <ResourceCompile Include="intersci.rc"> | ||
44 | <Filter>Resource Files</Filter> | ||
45 | </ResourceCompile> | ||
46 | </ItemGroup> | ||
47 | <ItemGroup> | ||
48 | <None Include="intersci_header.def"> | ||
49 | <Filter>Libraries Dependencies</Filter> | ||
50 | </None> | ||
51 | <None Include="core_import.def"> | ||
52 | <Filter>Libraries Dependencies\Imports</Filter> | ||
53 | </None> | ||
54 | <None Include="..\..\intersci.iss" /> | ||
55 | <None Include="..\..\locales\intersci.pot"> | ||
56 | <Filter>localization</Filter> | ||
57 | </None> | ||
58 | </ItemGroup> | ||
59 | </Project> \ No newline at end of file | ||
diff --git a/scilab/modules/intersci/src/lib/libinter.c b/scilab/modules/intersci/src/lib/libinter.c deleted file mode 100644 index 99ac8e5..0000000 --- a/scilab/modules/intersci/src/lib/libinter.c +++ /dev/null | |||
@@ -1,356 +0,0 @@ | |||
1 | /* | ||
2 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
3 | * Copyright (C) ????-2008 - INRIA | ||
4 | * | ||
5 | * This file must be used under the terms of the CeCILL. | ||
6 | * This source file is licensed as described in the file COPYING, which | ||
7 | * you should have received as part of this distribution. The terms | ||
8 | * are also available at | ||
9 | * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | #include <string.h> | ||
14 | |||
15 | #include "dynlib_intersci.h" | ||
16 | #include "MALLOC.h" | ||
17 | #include "../../../string/includes/men_Sutils.h" | ||
18 | #include "stack-c.h" | ||
19 | #include "libinter.h" | ||
20 | #include "cvstr.h" | ||
21 | |||
22 | |||
23 | |||
24 | /*-------------------------------------------------------------- | ||
25 | * A set of functions used with intersci | ||
26 | *--------------------------------------------------------------*/ | ||
27 | |||
28 | /*-------------------------------------------------------------- | ||
29 | * cchar : copy char ** to Scilab string code | ||
30 | * converts ip -> op | ||
31 | * char ** -> int * | ||
32 | *--------------------------------------------------------------*/ | ||
33 | |||
34 | void C2F(cchar)(int *n, char **ip,int *op) | ||
35 | { | ||
36 | int i = 0; | ||
37 | F2C(cvstr)(n,op,*ip,&i,*n); | ||
38 | } | ||
39 | |||
40 | /*-------------------------------------------------------------- | ||
41 | * ccharf : copy char ** to Scilab string code and ip is freed | ||
42 | * converts ip -> op | ||
43 | * char ** -> int * | ||
44 | *--------------------------------------------------------------*/ | ||
45 | |||
46 | void C2F(ccharf)(int *n,char **ip,int *op) | ||
47 | { | ||
48 | int i = 0; | ||
49 | if (*n > 0) { | ||
50 | F2C(cvstr)(n,op,*ip,&i,*n); | ||
51 | FREE(*ip); | ||
52 | } | ||
53 | } | ||
54 | |||
55 | /*-------------------------------------------------------------- | ||
56 | * cdouble : copy double ** to double * | ||
57 | *--------------------------------------------------------------*/ | ||
58 | |||
59 | void C2F(cdouble)(int *n,double *ip[],double *op) | ||
60 | { | ||
61 | int i; | ||
62 | for (i = 0; i < *n; i++) op[i]=(*ip)[i]; | ||
63 | } | ||
64 | |||
65 | /*-------------------------------------------------------------- | ||
66 | * cdoublef : copy double ** to double * and ip is freed | ||
67 | *--------------------------------------------------------------*/ | ||
68 | |||
69 | void C2F(cdoublef)(int *n,double *ip[],double *op) | ||
70 | { | ||
71 | int i; | ||
72 | if ( *n >0 ) { | ||
73 | for (i = 0; i < *n; i++) op[i]=(*ip)[i]; | ||
74 | FREE((char *)(*ip)); | ||
75 | } | ||
76 | } | ||
77 | |||
78 | /*-------------------------------------------------------------- | ||
79 | * cint : copy int ** to double * | ||
80 | *--------------------------------------------------------------*/ | ||
81 | |||
82 | void C2F(cint)(int *n,int *ip[],double *op) | ||
83 | { | ||
84 | int i; | ||
85 | for (i = 0; i < *n; i++) op[i]=(double)(*ip)[i]; | ||
86 | } | ||
87 | |||
88 | /*-------------------------------------------------------------- | ||
89 | * cintf : copy int ** to double * + pointer is freed | ||
90 | *--------------------------------------------------------------*/ | ||
91 | |||
92 | void C2F(cintf)(int *n,int *ip[],double *op) | ||
93 | { | ||
94 | int i; | ||
95 | if ( *n > 0 ) { | ||
96 | for (i = 0; i < *n; i++) | ||
97 | op[i]=(double)(*ip)[i]; | ||
98 | FREE((char *)(*ip)); | ||
99 | } | ||
100 | } | ||
101 | |||
102 | /*-------------------------------------------------------------- | ||
103 | * cfloat : copy float ** to double * | ||
104 | *--------------------------------------------------------------*/ | ||
105 | void C2F(cfloat)(int *n,float *ip[],double *op) | ||
106 | { | ||
107 | int i; | ||
108 | for (i = 0; i < *n; i++) op[i]=(double)(*ip)[i]; | ||
109 | } | ||
110 | |||
111 | /*-------------------------------------------------------------- | ||
112 | * cfloatf : copy float ** to double * + pointer is freed | ||
113 | *--------------------------------------------------------------*/ | ||
114 | |||
115 | void C2F(cfloatf)(int *n,float *ip[],double *op) | ||
116 | { | ||
117 | int i; | ||
118 | if ( *n > 0 ) { | ||
119 | for (i = 0; i < *n; i++) | ||
120 | op[i]=(double)(*ip)[i]; | ||
121 | FREE((char *)(*ip)); | ||
122 | } | ||
123 | } | ||
124 | |||
125 | /*-------------------------------------------------------------- | ||
126 | * cbool : copy int ** to int * | ||
127 | *--------------------------------------------------------------*/ | ||
128 | |||
129 | void C2F(cbool)(int *n,int *ip[],int *op) | ||
130 | { | ||
131 | int i; | ||
132 | for (i = 0; i < *n; i++) op[i]= (*ip)[i]; | ||
133 | } | ||
134 | |||
135 | /*-------------------------------------------------------------- | ||
136 | * cboolf : copy int ** to int * + pointer is freed | ||
137 | *--------------------------------------------------------------*/ | ||
138 | |||
139 | void C2F(cboolf)(int *n,int *ip[],int *op) | ||
140 | { | ||
141 | int i; | ||
142 | if ( *n > 0 ) { | ||
143 | for (i = 0; i < *n; i++) | ||
144 | op[i]= (*ip)[i]; | ||
145 | FREE((char *)(*ip)); | ||
146 | } | ||
147 | } | ||
148 | |||
149 | /*-------------------------------------------------------------- | ||
150 | * Cout : call to out | ||
151 | *--------------------------------------------------------------*/ | ||
152 | |||
153 | void Cout(char *str) | ||
154 | { | ||
155 | C2F(out)(str,(unsigned int)(strlen(str) + 1)); | ||
156 | } | ||
157 | |||
158 | /*-------------------------------------------------------------- | ||
159 | * cstringf : copy char *** to int * + pointer is freed | ||
160 | * converts ip -> op | ||
161 | * char ** -> int * | ||
162 | * string array pointer -> Scilab code of string matrix in an int array | ||
163 | *--------------------------------------------------------------*/ | ||
164 | |||
165 | void C2F(cstringf) (char ***ip, int *sciptr, int *m, int *n, int *max, int *ierr) | ||
166 | { | ||
167 | int i,j,l,ie; | ||
168 | int job=0; | ||
169 | int *chars; | ||
170 | *ierr=0; | ||
171 | if (5 + *m * *n > *max) { | ||
172 | *ierr = 1; | ||
173 | return; | ||
174 | } | ||
175 | sciptr[0]=sci_strings; | ||
176 | sciptr[1]=*m; | ||
177 | sciptr[2]=*n; | ||
178 | sciptr[3]=0; | ||
179 | sciptr[4]=1; | ||
180 | chars=&(sciptr[5 + *m * *n]); | ||
181 | ie=0; | ||
182 | for (j = 0; j < *n; j++) { | ||
183 | for (i = 0; i < *m; i++) { | ||
184 | l=(int)strlen((*ip)[ie]); | ||
185 | sciptr[ie+5]=sciptr[ie+4]+l; | ||
186 | if (5 + *m * *n + sciptr[ie+5] > *max) { | ||
187 | *ierr = 1; | ||
188 | return; | ||
189 | } | ||
190 | F2C(cvstr)(&l,&(chars[sciptr[ie+4]-1]),(*ip)[ie],&job,l); | ||
191 | FREE((*ip)[ie]); | ||
192 | ie++; | ||
193 | } | ||
194 | } | ||
195 | FREE((char *)*ip); | ||
196 | } | ||
197 | |||
198 | |||
199 | /*-------------------------------------------- | ||
200 | * stringc : fill *cptr with | ||
201 | * a converted Scilab string matrix | ||
202 | * *cptr is allocated | ||
203 | *--------------------------------------------*/ | ||
204 | |||
205 | int C2F(stringc)(int *sciptr,char ***cptr,int *ierr) | ||
206 | { | ||
207 | char **strings,*p; | ||
208 | int li,ni,*SciS,i,nstring,*ptrstrings; | ||
209 | |||
210 | *ierr=0; | ||
211 | nstring=sciptr[1]*sciptr[2]; | ||
212 | strings=(char **) MALLOC((unsigned) (nstring * sizeof(char *))); | ||
213 | if (strings==0) { | ||
214 | *ierr=1; return 0; | ||
215 | } | ||
216 | li=1; | ||
217 | ptrstrings=&(sciptr[4]); | ||
218 | SciS=&(sciptr[5+nstring]); | ||
219 | for ( i=1 ; i<nstring+1 ; i++) | ||
220 | { | ||
221 | ni=ptrstrings[i]-li; | ||
222 | li=ptrstrings[i]; | ||
223 | ScilabStr2C(&ni,SciS,&p,ierr); | ||
224 | strings[i-1]=p; | ||
225 | if ( *ierr == 1) return 0; | ||
226 | SciS += ni; | ||
227 | } | ||
228 | *cptr=strings; | ||
229 | return 0; | ||
230 | } | ||
231 | |||
232 | /*-------------------------------------------------------------- | ||
233 | * dbl2cdbl : fill *ip with contents of double array op | ||
234 | *--------------------------------------------------------------*/ | ||
235 | |||
236 | void C2F(dbl2cdbl)(int *n,double *ip[],double *op) | ||
237 | { | ||
238 | int i; | ||
239 | for (i = 0; i < *n; i++) (*ip)[i]=op[i]; | ||
240 | } | ||
241 | |||
242 | /*-------------------------------------------------------------- | ||
243 | * int2cint : fill *ip with contents of int array op | ||
244 | *--------------------------------------------------------------*/ | ||
245 | |||
246 | void C2F(int2cint)(int *n,int *ip[],int *op) | ||
247 | { | ||
248 | int i; | ||
249 | for (i = 0; i < *n; i++) (*ip)[i]=op[i]; | ||
250 | } | ||
251 | |||
252 | /** | ||
253 | * New Sparse matrix | ||
254 | * @param it | ||
255 | * @param m | ||
256 | * @param n | ||
257 | * @param nel | ||
258 | * @return | ||
259 | */ | ||
260 | SciSparse *NewSparse(int *it,int *m,int *n,int *nel) | ||
261 | { | ||
262 | SciSparse *loc; | ||
263 | loc = (SciSparse *) MALLOC((unsigned) sizeof(SciSparse)); | ||
264 | if ( loc == (SciSparse *) 0) | ||
265 | { | ||
266 | return((SciSparse *) 0); | ||
267 | } | ||
268 | loc->m = *m; | ||
269 | loc->n = *n; | ||
270 | loc->it = *it; | ||
271 | loc->nel = *nel; | ||
272 | loc->mnel = (int*) MALLOC((unsigned) (*m)*sizeof(int)); | ||
273 | if ( loc->mnel == (int *) 0) | ||
274 | { | ||
275 | FREE(loc); | ||
276 | return((SciSparse *) 0); | ||
277 | } | ||
278 | loc->icol = (int*) MALLOC((unsigned) (*nel)*sizeof(int)); | ||
279 | if ( loc->icol == (int *) 0) | ||
280 | { | ||
281 | FREE(loc->mnel); | ||
282 | FREE(loc); | ||
283 | return((SciSparse *) 0); | ||
284 | } | ||
285 | loc->R = (double*) MALLOC((unsigned) (*nel)*sizeof(double)); | ||
286 | if ( loc->R == (double *) 0) | ||
287 | { | ||
288 | FREE(loc->icol); | ||
289 | FREE(loc->mnel); | ||
290 | FREE(loc); | ||
291 | return((SciSparse *) 0); | ||
292 | } | ||
293 | |||
294 | if ( *it == 1) | ||
295 | { | ||
296 | loc->I = (double*) MALLOC((unsigned) (*nel)*sizeof(double)); | ||
297 | if ( loc->I == (double *) 0) | ||
298 | { | ||
299 | FREE(loc->R); | ||
300 | FREE(loc->icol); | ||
301 | FREE(loc->mnel); | ||
302 | FREE(loc); | ||
303 | return((SciSparse *) 0); | ||
304 | } | ||
305 | } | ||
306 | return(loc); | ||
307 | } | ||
308 | |||
309 | /** | ||
310 | * FreeSparse : free memory associated to a sparse | ||
311 | * @param x | ||
312 | */ | ||
313 | void FreeSparse(SciSparse *x) | ||
314 | { | ||
315 | if ( x->it == 1 ) FREE(x->I); | ||
316 | FREE(x->R); | ||
317 | FREE(x->icol); | ||
318 | FREE(x->mnel); | ||
319 | FREE(x); | ||
320 | } | ||
321 | |||
322 | /*-------------------------------------------- | ||
323 | * intersci external function for sparse | ||
324 | *--------------------------------------------*/ | ||
325 | |||
326 | int C2F(csparsef)(SciSparse **x,int *mnel,int *icol,double *R,double *I) | ||
327 | { | ||
328 | int i; | ||
329 | for ( i=0 ; i < (*x)->m ; i++) | ||
330 | mnel[i] = (*x)->mnel[i]; | ||
331 | for ( i=0 ; i < (*x)->nel ; i++) | ||
332 | { | ||
333 | icol[i] = (*x)->icol[i]; | ||
334 | R[i] = (*x)->R[i]; | ||
335 | if ( (*x)->it == 1 )I[i] = (*x)->I[i]; | ||
336 | } | ||
337 | FreeSparse(*x); | ||
338 | return 0; | ||
339 | } | ||
340 | /*--------------------------------------------------------------------------*/ | ||
341 | void FreeRhsSVar(char **ptrStr) | ||
342 | { | ||
343 | int i=0; | ||
344 | |||
345 | if (ptrStr) | ||
346 | { | ||
347 | while ( ptrStr[i] != NULL) | ||
348 | { | ||
349 | FREE(ptrStr[i]); | ||
350 | i++; | ||
351 | }; | ||
352 | FREE(ptrStr); | ||
353 | ptrStr=NULL; | ||
354 | } | ||
355 | } | ||
356 | /*--------------------------------------------------------------------------*/ | ||
diff --git a/scilab/modules/intersci/src/lib/out.c b/scilab/modules/intersci/src/lib/out.c deleted file mode 100644 index 93a5b92..0000000 --- a/scilab/modules/intersci/src/lib/out.c +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /* | ||
2 | * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab | ||
3 | * Copyright (C) 2006-2008 - INRIA - Allan CORNET | ||
4 | * | ||
5 | * This file must be used under the terms of the CeCILL. | ||
6 | * This source file is licensed as described in the file COPYING, which | ||
7 | * you should have received as part of this distribution. The terms | ||
8 | * are also available at | ||
9 | * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt | ||
10 | * | ||
11 | */ | ||
12 | |||
13 | /*--------------------------------------------------------------------------*/ | ||
14 | /* CORNET Allan */ | ||
15 | /* INRIA 2006 */ | ||
16 | /*--------------------------------------------------------------------------*/ | ||
17 | #include <string.h> | ||
18 | #include "stack-c.h" | ||
19 | #include "basout.h" | ||
20 | #include "libinter.h" | ||
21 | /*--------------------------------------------------------------------------*/ | ||
22 | int C2F(out)(char *str,long int str_len) | ||
23 | { | ||
24 | static int io; | ||
25 | C2F(basout)(&io, &C2F(iop).wte, str, (long int)strlen(str)); | ||
26 | return 0; | ||
27 | } | ||
28 | /*--------------------------------------------------------------------------*/ | ||