summaryrefslogtreecommitdiffstats
path: root/scilab/modules/intersci
diff options
context:
space:
mode:
Diffstat (limited to 'scilab/modules/intersci')
-rw-r--r--scilab/modules/intersci/includes/dynlib_intersci.h28
-rw-r--r--scilab/modules/intersci/includes/libinter.h37
-rw-r--r--scilab/modules/intersci/src/lib/intersci.vcproj23
-rw-r--r--scilab/modules/intersci/src/lib/intersci_header.def4
-rw-r--r--scilab/modules/intersci/src/lib/libinter.c1
-rw-r--r--scilab/modules/intersci/src/lib/out.c3
6 files changed, 65 insertions, 31 deletions
diff --git a/scilab/modules/intersci/includes/dynlib_intersci.h b/scilab/modules/intersci/includes/dynlib_intersci.h
new file mode 100644
index 0000000..39a4314
--- /dev/null
+++ b/scilab/modules/intersci/includes/dynlib_intersci.h
@@ -0,0 +1,28 @@
1/*
2* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3* Copyright (C) DIGITEO - 2009 - 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#ifndef __DYNLIB_INTERSCI_H__
15#define __DYNLIB_INTERSCI_H__
16
17#ifdef _MSC_VER
18#ifdef INTERSCI_EXPORTS
19#define INTERSCI_IMPEXP __declspec(dllexport)
20#else
21#define INTERSCI_IMPEXP __declspec(dllimport)
22#endif
23#else
24#define INTERSCI_IMPEXP
25#endif
26
27#endif /* __DYNLIB_INTERSCI_H__ */
28/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/intersci/includes/libinter.h b/scilab/modules/intersci/includes/libinter.h
index e465ef3..2fce801 100644
--- a/scilab/modules/intersci/includes/libinter.h
+++ b/scilab/modules/intersci/includes/libinter.h
@@ -13,25 +13,30 @@
13 13
14#ifndef __LIBINTER_H__ 14#ifndef __LIBINTER_H__
15#define __LIBINTER_H__ 15#define __LIBINTER_H__
16 16#include "dynlib_intersci.h"
17#include "machine.h" /* C2F */ 17#include "machine.h" /* C2F */
18 18
19#include "scisparse.h" /* SciSparse struct */ 19#include "scisparse.h" /* SciSparse struct */
20 20
21void C2F(out) (char *str,unsigned int); 21INTERSCI_IMPEXP int C2F(out)(char *str,long int str_len);
22void C2F(ccharf) ( int *n, char **ip, int *op); 22INTERSCI_IMPEXP void C2F(cdouble)(int *n,double *ip[],double *op);
23void C2F(cchar) ( int *n, char **ip, int *op); 23INTERSCI_IMPEXP void C2F(cfloat)(int *n,float *ip[],double *op);
24void C2F(cdoublef) ( int *n, double *ip[], double *op); 24INTERSCI_IMPEXP void C2F(cint)(int *n,int *ip[],double *op);
25void C2F(cintf) ( int *n, int *ip[], double *op); 25INTERSCI_IMPEXP void C2F(ccharf) ( int *n, char **ip, int *op);
26void C2F(cfloatf) ( int *n, float *ip[], double *op); 26INTERSCI_IMPEXP void C2F(cchar) ( int *n, char **ip, int *op);
27void C2F(cboolf) ( int *n, int *ip[], int *op); 27INTERSCI_IMPEXP void C2F(cbool)(int *n,int *ip[],int *op);
28void Cout (char *str); 28INTERSCI_IMPEXP void C2F(cdoublef) ( int *n, double *ip[], double *op);
29void C2F(dbl2cdbl)(int *n,double *ip[], double *op); 29INTERSCI_IMPEXP void C2F(cintf) ( int *n, int *ip[], double *op);
30void C2F(int2cint)( int *n, int *ip[], int *op); 30INTERSCI_IMPEXP void C2F(cfloatf) ( int *n, float *ip[], double *op);
31 31INTERSCI_IMPEXP void C2F(cboolf) ( int *n, int *ip[], int *op);
32int C2F(csparsef)(SciSparse **x,int *mnel,int *icol,double *R,double *I); 32INTERSCI_IMPEXP void Cout (char *str);
33SciSparse *NewSparse(int *,int *,int *,int *); 33INTERSCI_IMPEXP void C2F(dbl2cdbl)(int *n,double *ip[], double *op);
34void FreeSparse(SciSparse *x); 34INTERSCI_IMPEXP void C2F(int2cint)( int *n, int *ip[], int *op);
35void FreeRhsSVar(char **ptrStr); 35INTERSCI_IMPEXP void C2F(cstringf) (char ***ip, int *sciptr, int *m, int *n, int *max, int *ierr);
36INTERSCI_IMPEXP int C2F(stringc)(int *sciptr,char ***cptr,int *ierr);
37INTERSCI_IMPEXP int C2F(csparsef)(SciSparse **x,int *mnel,int *icol,double *R,double *I);
38INTERSCI_IMPEXP SciSparse *NewSparse(int *,int *,int *,int *);
39INTERSCI_IMPEXP void FreeSparse(SciSparse *x);
40INTERSCI_IMPEXP void FreeRhsSVar(char **ptrStr);
36 41
37#endif /* !__LIBINTER_H__ */ 42#endif /* !__LIBINTER_H__ */
diff --git a/scilab/modules/intersci/src/lib/intersci.vcproj b/scilab/modules/intersci/src/lib/intersci.vcproj
index 32e24d4..bd65121 100644
--- a/scilab/modules/intersci/src/lib/intersci.vcproj
+++ b/scilab/modules/intersci/src/lib/intersci.vcproj
@@ -1,4 +1,4 @@
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"
@@ -6,6 +6,7 @@
6 ProjectGUID="{DFA0D75B-F7EF-4D02-B33F-486829405315}" 6 ProjectGUID="{DFA0D75B-F7EF-4D02-B33F-486829405315}"
7 RootNamespace="intersci" 7 RootNamespace="intersci"
8 Keyword="Win32Proj" 8 Keyword="Win32Proj"
9 TargetFrameworkVersion="0"
9 > 10 >
10 <Platforms> 11 <Platforms>
11 <Platform 12 <Platform
@@ -62,14 +63,14 @@
62 <Tool 63 <Tool
63 Name="VCPreLinkEventTool" 64 Name="VCPreLinkEventTool"
64 Description="Make dependencies" 65 Description="Make dependencies"
65 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n intersci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def interscitmp.def &gt;nul&#x0D;&#x0A;copy ..\intersci_header.def+interscitmp.def ..\intersci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;" 66 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
66 /> 67 />
67 <Tool 68 <Tool
68 Name="VCLinkerTool" 69 Name="VCLinkerTool"
69 AdditionalDependencies="LibScilab.lib" 70 AdditionalDependencies="LibScilab.lib"
70 OutputFile="../../../../bin/$(ProjectName).dll" 71 OutputFile="../../../../bin/$(ProjectName).dll"
71 LinkIncremental="1" 72 LinkIncremental="1"
72 ModuleDefinitionFile="intersci.def" 73 ModuleDefinitionFile=""
73 GenerateDebugInformation="true" 74 GenerateDebugInformation="true"
74 SubSystem="2" 75 SubSystem="2"
75 RandomizedBaseAddress="1" 76 RandomizedBaseAddress="1"
@@ -144,14 +145,14 @@
144 <Tool 145 <Tool
145 Name="VCPreLinkEventTool" 146 Name="VCPreLinkEventTool"
146 Description="Make dependencies" 147 Description="Make dependencies"
147 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n intersci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def interscitmp.def &gt;nul&#x0D;&#x0A;copy ..\intersci_header.def+interscitmp.def ..\intersci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;" 148 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
148 /> 149 />
149 <Tool 150 <Tool
150 Name="VCLinkerTool" 151 Name="VCLinkerTool"
151 AdditionalDependencies="LibScilab.lib" 152 AdditionalDependencies="LibScilab.lib"
152 OutputFile="../../../../bin/$(ProjectName).dll" 153 OutputFile="../../../../bin/$(ProjectName).dll"
153 LinkIncremental="1" 154 LinkIncremental="1"
154 ModuleDefinitionFile="intersci.def" 155 ModuleDefinitionFile=""
155 GenerateDebugInformation="true" 156 GenerateDebugInformation="true"
156 SubSystem="2" 157 SubSystem="2"
157 RandomizedBaseAddress="1" 158 RandomizedBaseAddress="1"
@@ -228,14 +229,14 @@
228 <Tool 229 <Tool
229 Name="VCPreLinkEventTool" 230 Name="VCPreLinkEventTool"
230 Description="Make dependencies" 231 Description="Make dependencies"
231 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n intersci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def interscitmp.def &gt;nul&#x0D;&#x0A;copy ..\intersci_header.def+interscitmp.def ..\intersci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;" 232 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
232 /> 233 />
233 <Tool 234 <Tool
234 Name="VCLinkerTool" 235 Name="VCLinkerTool"
235 AdditionalDependencies="LibScilab.lib" 236 AdditionalDependencies="LibScilab.lib"
236 OutputFile="../../../../bin/$(ProjectName).dll" 237 OutputFile="../../../../bin/$(ProjectName).dll"
237 LinkIncremental="1" 238 LinkIncremental="1"
238 ModuleDefinitionFile="intersci.def" 239 ModuleDefinitionFile=""
239 GenerateDebugInformation="false" 240 GenerateDebugInformation="false"
240 SubSystem="2" 241 SubSystem="2"
241 OptimizeReferences="2" 242 OptimizeReferences="2"
@@ -317,14 +318,14 @@
317 <Tool 318 <Tool
318 Name="VCPreLinkEventTool" 319 Name="VCPreLinkEventTool"
319 Description="Make dependencies" 320 Description="Make dependencies"
320 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do ..\..\..\..\..\bin\dumpexts -o %%~nf.def -n intersci.dll %%f &gt;nul&#x0D;&#x0A;copy *.def interscitmp.def &gt;nul&#x0D;&#x0A;copy ..\intersci_header.def+interscitmp.def ..\intersci.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;" 321 CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;"
321 /> 322 />
322 <Tool 323 <Tool
323 Name="VCLinkerTool" 324 Name="VCLinkerTool"
324 AdditionalDependencies="LibScilab.lib" 325 AdditionalDependencies="LibScilab.lib"
325 OutputFile="../../../../bin/$(ProjectName).dll" 326 OutputFile="../../../../bin/$(ProjectName).dll"
326 LinkIncremental="1" 327 LinkIncremental="1"
327 ModuleDefinitionFile="intersci.def" 328 ModuleDefinitionFile=""
328 GenerateDebugInformation="false" 329 GenerateDebugInformation="false"
329 SubSystem="2" 330 SubSystem="2"
330 OptimizeReferences="2" 331 OptimizeReferences="2"
@@ -382,6 +383,10 @@
382 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" 383 UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
383 > 384 >
384 <File 385 <File
386 RelativePath="..\..\includes\dynlib_intersci.h"
387 >
388 </File>
389 <File
385 RelativePath="..\..\includes\libinter.h" 390 RelativePath="..\..\includes\libinter.h"
386 > 391 >
387 </File> 392 </File>
diff --git a/scilab/modules/intersci/src/lib/intersci_header.def b/scilab/modules/intersci/src/lib/intersci_header.def
deleted file mode 100644
index aa1b413..0000000
--- a/scilab/modules/intersci/src/lib/intersci_header.def
+++ /dev/null
@@ -1,4 +0,0 @@
1LIBRARY intersci.dll
2
3
4EXPORTS
diff --git a/scilab/modules/intersci/src/lib/libinter.c b/scilab/modules/intersci/src/lib/libinter.c
index 11187e9..2c5b0e6 100644
--- a/scilab/modules/intersci/src/lib/libinter.c
+++ b/scilab/modules/intersci/src/lib/libinter.c
@@ -12,6 +12,7 @@
12 12
13#include <string.h> 13#include <string.h>
14 14
15#include "dynlib_intersci.h"
15#include "MALLOC.h" 16#include "MALLOC.h"
16#include "../../../string/includes/men_Sutils.h" 17#include "../../../string/includes/men_Sutils.h"
17#include "stack-c.h" 18#include "stack-c.h"
diff --git a/scilab/modules/intersci/src/lib/out.c b/scilab/modules/intersci/src/lib/out.c
index 2f3632f..93a5b92 100644
--- a/scilab/modules/intersci/src/lib/out.c
+++ b/scilab/modules/intersci/src/lib/out.c
@@ -17,8 +17,7 @@
17#include <string.h> 17#include <string.h>
18#include "stack-c.h" 18#include "stack-c.h"
19#include "basout.h" 19#include "basout.h"
20/*--------------------------------------------------------------------------*/ 20#include "libinter.h"
21int C2F(out)(char *str,long int str_len);
22/*--------------------------------------------------------------------------*/ 21/*--------------------------------------------------------------------------*/
23int C2F(out)(char *str,long int str_len) 22int C2F(out)(char *str,long int str_len)
24{ 23{