YaSp Scicos: link using the old API 92/14792/5
Clément DAVID [Mon, 30 Jun 2014 15:28:53 +0000 (17:28 +0200)]
This is a first link, some of these gateways should be updated to
API Scilab. All the used fortran API has been stubbed and will abort()
Scilab.

Change-Id: Ic98b61a8441f8c75ede75d0a424618e37e20bbbc

50 files changed:
scilab/modules/functions/xml/gateway5-convert.xsl
scilab/modules/functions_manager/src/cpp/dynamic_modules.cpp
scilab/modules/javasci/Makefile.in
scilab/modules/scicos/Makefile.am
scilab/modules/scicos/Makefile.in
scilab/modules/scicos/includes/gw_scicos.h
scilab/modules/scicos/sci_gateway/c/sci_buildouttb.c
scilab/modules/scicos/sci_gateway/c/sci_callblk.c
scilab/modules/scicos/sci_gateway/c/sci_coserror.c
scilab/modules/scicos/sci_gateway/c/sci_ctree2.c
scilab/modules/scicos/sci_gateway/c/sci_ctree3.c
scilab/modules/scicos/sci_gateway/c/sci_ctree4.c
scilab/modules/scicos/sci_gateway/c/sci_curblock.c
scilab/modules/scicos/sci_gateway/c/sci_curblockc.c
scilab/modules/scicos/sci_gateway/c/sci_data2sig.c
scilab/modules/scicos/sci_gateway/c/sci_diffobjs.c
scilab/modules/scicos/sci_gateway/c/sci_duplicate.c
scilab/modules/scicos/sci_gateway/c/sci_end_scicosim.c
scilab/modules/scicos/sci_gateway/c/sci_ftree2.c
scilab/modules/scicos/sci_gateway/c/sci_ftree3.c
scilab/modules/scicos/sci_gateway/c/sci_ftree4.c
scilab/modules/scicos/sci_gateway/c/sci_getblocklabel.c
scilab/modules/scicos/sci_gateway/c/sci_getscicosvars.c
scilab/modules/scicos/sci_gateway/c/sci_haltscicos.c
scilab/modules/scicos/sci_gateway/c/sci_loadScicos.c
scilab/modules/scicos/sci_gateway/c/sci_model2blk.c
scilab/modules/scicos/sci_gateway/c/sci_phase_simulation.c
scilab/modules/scicos/sci_gateway/c/sci_pointer_xproperty.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_debug.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_debug_count.c
scilab/modules/scicos/sci_gateway/c/sci_scicos_time.c
scilab/modules/scicos/sci_gateway/c/sci_scicosim.c
scilab/modules/scicos/sci_gateway/c/sci_sctree.c
scilab/modules/scicos/sci_gateway/c/sci_set_blockerror.c
scilab/modules/scicos/sci_gateway/c/sci_set_xproperty.c
scilab/modules/scicos/sci_gateway/c/sci_sig2data.c
scilab/modules/scicos/sci_gateway/c/sci_var2vec.c
scilab/modules/scicos/sci_gateway/c/sci_vec2var.c
scilab/modules/scicos/sci_gateway/scicos_gateway.xml
scilab/modules/scicos/src/c/scicos.vcxproj
scilab/modules/scicos/src/c/scicos.vcxproj.filters
scilab/modules/scicos/src/c/scilab5_needed_stubs.c [new file with mode: 0644]
scilab/modules/scicos/src/fortran/Scicos_Import.def
scilab/modules/scicos/src/fortran/core_Import.def [deleted file]
scilab/modules/scicos/src/fortran/scicos_f.vfproj
scilab/modules/scicos/src/fortran/scifunc.f
scilab/modules/scicos_blocks/src/c/scicos_blocks.vcxproj
scilab/modules/scicos_blocks/src/fortran/core_Import.def [deleted file]
scilab/modules/scicos_blocks/src/fortran/sciblk.f
scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.vfproj

index 425943b..40c8c8e 100644 (file)
             <xsl:for-each select="GATEWAY/PRIMITIVE">
                 <gateway type="0">
                     <xsl:attribute name="name">
-                        <xsl:value-of select="@primitiveName" />
+                        <xsl:value-of select="concat('sci_', @primitiveName)" />
                     </xsl:attribute>
                     <xsl:attribute name="function">
-                        <xsl:value-of select="concat('sci_', @primitiveName)" />
+                        <xsl:value-of select="@primitiveName" />
                     </xsl:attribute>
                     <xsl:attribute name="type">0</xsl:attribute>
                 </gateway>
index 9b35ee7..4e50e2b 100644 (file)
@@ -21,6 +21,7 @@ extern "C"
 #include <libxml/xpath.h>
 #include <libxml/xmlreader.h>
 #include "sci_malloc.h"
+#include "sci_mode.h"
 }
 
 using namespace types;
@@ -522,10 +523,15 @@ int XmlModule::Load()
 int ScicosModule::Load()
 {
     wstring wstModuleName = L"scicos";
+    const wchar_t* wstLibName = wstModuleName.c_str();
+    if (getScilabMode() == SCILAB_NWNI)
+    {
+        wstLibName = L"scicos-cli";
+    }
 #ifdef _MSC_VER
-    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_1);
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstLibName, DYNLIB_NAME_FORMAT_1);
 #else
-    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstModuleName.c_str(), DYNLIB_NAME_FORMAT_3);
+    wchar_t* pwstLibName = buildModuleDynLibraryNameW(wstLibName, DYNLIB_NAME_FORMAT_3);
 #endif
     vectGateway vect = loadGatewaysName(wstModuleName);
 
index b44d980..0c78dc2 100644 (file)
@@ -985,9 +985,9 @@ maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
        -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@distclean-local:
 @JAVASCI_FALSE@clean-local:
 @JAVASCI_FALSE@install-data-local:
+@JAVASCI_FALSE@distclean-local:
 @JAVASCI_FALSE@install-html-local:
 clean: clean-am
 
index 3ac84eb..8a392f9 100644 (file)
@@ -13,7 +13,9 @@ DISABLE_HELP_CLEAN=yes
 
 #### Source listing ######
 
-SCICOS_C_SOURCES = src/c/tree.c \
+SCICOS_C_SOURCES = \
+src/c/scilab5_needed_stubs.c \
+src/c/tree.c \
 src/c/scicos_malloc.c \
 src/c/scicos_print.c \
 src/c/import.c \
index 413279f..4fdc5a9 100644 (file)
@@ -202,10 +202,11 @@ LTLIBRARIES = $(noinst_LTLIBRARIES) $(pkglib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libsciscicos_algo_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am__libsciscicos_algo_la_SOURCES_DIST = src/c/noscicos/noscicos.c \
-       src/c/tree.c src/c/scicos_malloc.c src/c/scicos_print.c \
-       src/c/import.c src/c/scicos.c src/c/scicos_free.c \
-       src/c/sciblk2.c src/c/sciblk4.c src/c/ezxml.c src/c/il_state.c \
-       src/c/il_sim.c src/c/createblklist.c src/c/var2sci.c \
+       src/c/scilab5_needed_stubs.c src/c/tree.c \
+       src/c/scicos_malloc.c src/c/scicos_print.c src/c/import.c \
+       src/c/scicos.c src/c/scicos_free.c src/c/sciblk2.c \
+       src/c/sciblk4.c src/c/ezxml.c src/c/il_state.c src/c/il_sim.c \
+       src/c/createblklist.c src/c/var2sci.c \
        src/c/copyvarfromlistentry.c src/c/MlistGetFieldNumber.c \
        src/c/extractblklist.c src/c/lsodar.c src/c/ddaskr.c \
        src/fortran/scitovv.f src/fortran/vvtosci.f \
@@ -216,7 +217,8 @@ am__libsciscicos_algo_la_SOURCES_DIST = src/c/noscicos/noscicos.c \
        src/fortran/scitoi.f src/fortran/scifunc.f
 am__dirstamp = $(am__leading_dot)dirstamp
 am__objects_1 = src/c/noscicos/libsciscicos_algo_la-noscicos.lo
-am__objects_2 = src/c/libsciscicos_algo_la-tree.lo \
+am__objects_2 = src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo \
+       src/c/libsciscicos_algo_la-tree.lo \
        src/c/libsciscicos_algo_la-scicos_malloc.lo \
        src/c/libsciscicos_algo_la-scicos_print.lo \
        src/c/libsciscicos_algo_la-import.lo \
@@ -870,7 +872,9 @@ modulename = scicos
 DISABLE_HELP_CLEAN = yes
 
 #### Source listing ######
-SCICOS_C_SOURCES = src/c/tree.c \
+SCICOS_C_SOURCES = \
+src/c/scilab5_needed_stubs.c \
+src/c/tree.c \
 src/c/scicos_malloc.c \
 src/c/scicos_print.c \
 src/c/import.c \
@@ -1358,6 +1362,8 @@ src/c/$(am__dirstamp):
 src/c/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) src/c/$(DEPDIR)
        @: > src/c/$(DEPDIR)/$(am__dirstamp)
+src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo:  \
+       src/c/$(am__dirstamp) src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libsciscicos_algo_la-tree.lo: src/c/$(am__dirstamp) \
        src/c/$(DEPDIR)/$(am__dirstamp)
 src/c/libsciscicos_algo_la-scicos_malloc.lo: src/c/$(am__dirstamp) \
@@ -1947,6 +1953,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_free.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_malloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scicos_print.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-scilab5_needed_stubs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-tree.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/$(DEPDIR)/libsciscicos_algo_la-var2sci.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@src/c/noscicos/$(DEPDIR)/libsciscicos_algo_la-noscicos.Plo@am__quote@
@@ -2001,6 +2008,13 @@ src/c/noscicos/libsciscicos_algo_la-noscicos.lo: src/c/noscicos/noscicos.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/noscicos/libsciscicos_algo_la-noscicos.lo `test -f 'src/c/noscicos/noscicos.c' || echo '$(srcdir)/'`src/c/noscicos/noscicos.c
 
+src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo: src/c/scilab5_needed_stubs.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo -MD -MP -MF src/c/$(DEPDIR)/libsciscicos_algo_la-scilab5_needed_stubs.Tpo -c -o src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo `test -f 'src/c/scilab5_needed_stubs.c' || echo '$(srcdir)/'`src/c/scilab5_needed_stubs.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libsciscicos_algo_la-scilab5_needed_stubs.Tpo src/c/$(DEPDIR)/libsciscicos_algo_la-scilab5_needed_stubs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='src/c/scilab5_needed_stubs.c' object='src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/c/libsciscicos_algo_la-scilab5_needed_stubs.lo `test -f 'src/c/scilab5_needed_stubs.c' || echo '$(srcdir)/'`src/c/scilab5_needed_stubs.c
+
 src/c/libsciscicos_algo_la-tree.lo: src/c/tree.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsciscicos_algo_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/c/libsciscicos_algo_la-tree.lo -MD -MP -MF src/c/$(DEPDIR)/libsciscicos_algo_la-tree.Tpo -c -o src/c/libsciscicos_algo_la-tree.lo `test -f 'src/c/tree.c' || echo '$(srcdir)/'`src/c/tree.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) src/c/$(DEPDIR)/libsciscicos_algo_la-tree.Tpo src/c/$(DEPDIR)/libsciscicos_algo_la-tree.Plo
index bd0692f..2a4c4ea 100644 (file)
 #include "dynlib_scicos.h"
 #include "machine.h"
 /*--------------------------------------------------------------------------*/
-SCICOS_IMPEXP int gw_scicos(void);
-/*--------------------------------------------------------------------------*/
 /* interface for the previous function Table */
 /*--------------------------------------------------------------------------*/
-SCICOS_IMPEXP int sci_var2vec(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_vec2var(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_getblocklabel(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_scicos_debug(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_scicos_debug_count(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_sctree(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_ftree2(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_ftree3(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_ftree4(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_curblock(char *fname, unsigned long fname_len);
+SCICOS_IMPEXP int sci_var2vec(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_vec2var(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_getblocklabel(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_scicos_debug(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_scicos_debug_count(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_sctree(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_ftree2(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_ftree3(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_ftree4(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_curblock(char *fname, void* pvApiCtx);
 
-SCICOS_IMPEXP int sci_scicos_time(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_duplicate(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_diffobjs(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_pointer_xproperty(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_phase_simulation(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_set_xproperty(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_set_blockerror(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_ctree2(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_ctree3(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_ctree4(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_scicosim(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_getscicosvars(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_curblockc(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_buildouttb(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_end_scicosim(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_haltscicos(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_coserror(char *fname, unsigned long fname_len);
+SCICOS_IMPEXP int sci_scicos_time(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_duplicate(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_diffobjs(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_pointer_xproperty(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_phase_simulation(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_set_xproperty(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_set_blockerror(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_ctree2(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_ctree3(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_ctree4(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_scicosim(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_getscicosvars(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_curblockc(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_buildouttb(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_end_scicosim(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_haltscicos(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_coserror(char *fname, void* pvApiCtx);
 
 /* it was in a separate gateway */
-SCICOS_IMPEXP int sci_data2sig(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_sig2data(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_model2blk(char *fname, unsigned long fname_len);
-SCICOS_IMPEXP int sci_callblk(char *fname, unsigned long fname_len);
+SCICOS_IMPEXP int sci_data2sig(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_sig2data(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_model2blk(char *fname, void* pvApiCtx);
+SCICOS_IMPEXP int sci_callblk(char *fname, void* pvApiCtx);
 
-SCICOS_IMPEXP int sci_loadScicos(char *fname, unsigned long fname_len);
+SCICOS_IMPEXP int sci_loadScicos(char *fname, void* pvApiCtx);
 
 /*--------------------------------------------------------------------------*/
 #endif /*  __GW_SCICOS__ */
index 0ae667c..752b1fa 100644 (file)
@@ -53,7 +53,7 @@
 *
 */
 /*--------------------------------------------------------------------------*/
-int sci_buildouttb(char *fname, unsigned long fname_len)
+int sci_buildouttb(char *fname, void* pvApiCtx)
 {
 #if 0
     static int l1 = 0, m1 = 0,   n1 = 0;
index 28775a3..ca62b21 100644 (file)
@@ -33,9 +33,9 @@
 /*--------------------------------------------------------------------------*/
 extern int *listentry(int *header, int i);
 /*--------------------------------------------------------------------------*/
-int sci_callblk(char *fname, unsigned long fname_len)
+int sci_callblk(char *fname, void* pvApiCtx)
 {
-    #if 0
+#if 0
     /* auxilary variables -dimension and address-
     * for scilab stack variables
     */
index 793e0ea..89fa89c 100644 (file)
@@ -43,7 +43,7 @@ extern struct
 } C2F(cosim);
 extern COSERR_struct coserr;
 /*--------------------------------------------------------------------------*/
-int sci_coserror(char *fname, unsigned long fname_len)
+int sci_coserror(char *fname, void* pvApiCtx)
 /* renvoi un message erreur */
 {
     /* auxilary variables for dimension and address */
index 67c8c81..7521831 100644 (file)
@@ -24,7 +24,7 @@
 #include "stack-c.h"
 #include "tree.h"
 /*--------------------------------------------------------------------------*/
-int sci_ctree2(char *fname, unsigned long fname_len)
+int sci_ctree2(char *fname, void* pvApiCtx)
 {
     //int one = 1, ipvec = 0, nvec = 0, mvec = 0, noin = 0, moin = 0, ipoin = 0, noinr = 0, moinr = 0, ipoinr = 0;
     //int ndep = 0, mdep = 0, ipdep = 0, ndepuptr = 0, mdepuptr = 0, ipdepuptr = 0, ipord = 0, ipok = 0, n = 0, nord = 0;
index af5aa8d..d500566 100644 (file)
@@ -24,7 +24,7 @@
 #include "stack-c.h"
 #include "tree.h"
 /*--------------------------------------------------------------------------*/
-int sci_ctree3(char *fname, unsigned long fname_len)
+int sci_ctree3(char *fname, void* pvApiCtx)
 {
     //int one = 1, ipvec = 0, nvec = 0, mvec = 0, ntyp = 0, mtyp = 0, iptyp = 0, nbex = 0, mbex = 0, ipbex = 0;
     //int ndep = 0, mdep = 0, ipdep = 0, ndepuptr = 0, mdepuptr = 0, ipdepuptr = 0, ipord = 0, ipok = 0, n = 0, nord = 0;
index 0158edd..5d6143a 100644 (file)
@@ -23,7 +23,7 @@
 #include "stack-c.h"
 #include "tree.h"
 /*--------------------------------------------------------------------------*/
-int sci_ctree4(char *fname, unsigned long fname_len)
+int sci_ctree4(char *fname, void* pvApiCtx)
 {
     //int one = 1, ipvec = 0, nvec = 0, mvec = 0, noin = 0, moin = 0, ipoin = 0, noinr = 0, moinr = 0, ipoinr = 0;
     //int nnd = 0, mnd = 0, ipnd = 0, ntyp = 0, mtyp = 0, iptyp = 0, ipr1 = 0, ipr2 = 0, n = 0, nr = 0, nn = 0;
index a0722a3..e138e97 100644 (file)
@@ -28,7 +28,7 @@
 /*--------------------------------------------------------------------------*/
 extern int C2F(intcurblk)(); /* fortran subroutine */
 /*--------------------------------------------------------------------------*/
-int sci_curblock(char *fname, unsigned long fname_len)
+int sci_curblock(char *fname, void* pvApiCtx)
 {
     //C2F(intcurblk)();
     return 0;
index e783c20..1b6c5d7 100644 (file)
@@ -40,7 +40,7 @@
 * 12/02/07 : update lhs to double output
 *
 */
-int sci_curblockc(char *fname, unsigned long fname_len)
+int sci_curblockc(char *fname, void* pvApiCtx)
 {
     ///***********************
     //* variables declaration
index 61eb31d..d80e43e 100644 (file)
@@ -72,7 +72,7 @@ extern int C2F(mkmlist)();
 *
 */
 /*--------------------------------------------------------------------------*/
-int sci_data2sig(char *fname, unsigned long fname_len)
+int sci_data2sig(char *fname, void* pvApiCtx)
 {
     //int m1 = 0, n1 = 0, it = 0;
     //int p1 = 0;
index fccff8b..19fa969 100644 (file)
@@ -24,7 +24,7 @@
 #include "stack-c.h"
 #include "sci_malloc.h"
 /*--------------------------------------------------------------------------*/
-int sci_diffobjs(char *fname, unsigned long fname_len)
+int sci_diffobjs(char *fname, void* pvApiCtx)
 {
 #if 0
     int one = 1, l3 = 0, k = 0;
index 524bdae..50028f8 100644 (file)
@@ -31,7 +31,7 @@
 static void duplicata(int *n, double *v, double *w, double *ww, int *nw);
 static void comp_size(double *v, int *nw, int n);
 /*--------------------------------------------------------------------------*/
-int sci_duplicate(char *fname, unsigned long fname_len)
+int sci_duplicate(char *fname, void* pvApiCtx)
 {
     //int m1 = 0, m2 = 0, m3 = 0, n1 = 0, n2 = 0, n3 = 0, l1 = 0, l2 = 0, l3 = 0, n = 0;
 
index 58409a0..496b20e 100644 (file)
@@ -32,7 +32,7 @@
 /*--------------------------------------------------------------------------*/
 extern COSIM_struct C2F(cosim);
 /*--------------------------------------------------------------------------*/
-int sci_end_scicosim(char *fname, unsigned long fname_len)
+int sci_end_scicosim(char *fname, void* pvApiCtx)
 {
     ///* termine la simulation */
     //int isrun = C2F(cosim).isrun;
index 70d2ea2..43a6270 100644 (file)
 #include "gw_scicos.h"
 #include "stack-c.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intree2)(char *fname, unsigned long fname_len); /* fortran subroutine */
+extern int C2F(intree2)(char *fname, void* pvApiCtx); /* fortran subroutine */
 /*--------------------------------------------------------------------------*/
-int sci_ftree2(char *fname, unsigned long fname_len)
+int sci_ftree2(char *fname, void* pvApiCtx)
 {
     //CheckLhs(2, 2);
     //CheckRhs(4, 4);
-    //C2F(intree2)(fname, fname_len);
+    //C2F(intree2)(fname, pvApiCtx);
     //PutLhsVar();
     return 0;
 }
index 2f3a206..f69dd64 100644 (file)
 #include "gw_scicos.h"
 #include "stack-c.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intree3) (char *fname, unsigned long fname_len); /*fortran subroutine */
+extern int C2F(intree3) (char *fname, void* pvApiCtx); /*fortran subroutine */
 /*--------------------------------------------------------------------------*/
-int sci_ftree3(char *fname, unsigned long fname_len)
+int sci_ftree3(char *fname, void* pvApiCtx)
 {
     //CheckLhs(2, 2);
     //CheckRhs(7, 7);
-    //C2F(intree3)(fname, fname_len);
+    //C2F(intree3)(fname, pvApiCtx);
     //PutLhsVar();
     return 0;
 }
index cd5ccf6..676a929 100644 (file)
 #include "gw_scicos.h"
 #include "stack-c.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intree4) (char *fname, unsigned long fname_len); /* fortran subroutine */
+extern int C2F(intree4) (char *fname, void* pvApiCtx); /* fortran subroutine */
 /*--------------------------------------------------------------------------*/
-int sci_ftree4(char *fname, unsigned long fname_len)
+int sci_ftree4(char *fname, void* pvApiCtx)
 {
     //CheckLhs(2, 2);
     //CheckRhs(5, 5);
-    //C2F(intree4)(fname, fname_len);
+    //C2F(intree4)(fname, pvApiCtx);
     //PutLhsVar();
     return 0;
 }
index d103665..11eac24 100644 (file)
 #include "machine.h" /* C2F */
 #include "gw_scicos.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intgetlabel)(char *fname, unsigned long fname_len); /* fortran subroutine */
+extern int C2F(intgetlabel)(char *fname, void* pvApiCtx); /* fortran subroutine */
 /*--------------------------------------------------------------------------*/
-int sci_getblocklabel(char *fname, unsigned long fname_len)
+int sci_getblocklabel(char *fname, void* pvApiCtx)
 {
-    return C2F(intgetlabel)(fname, fname_len);
+    return C2F(intgetlabel)(fname, pvApiCtx);
 }
 /*--------------------------------------------------------------------------*/
index ad698e5..25da5ad 100644 (file)
@@ -74,7 +74,7 @@ extern int C2F(mktlist)();
 * 09/02/07, Alan : Update with oz/opar and restore il_sim_save only for opar
 *
 */
-int sci_getscicosvars(char *fname, unsigned long fname_len)
+int sci_getscicosvars(char *fname, void* pvApiCtx)
 {
     ///************************************
     //* variables and constants d?inition
index 2edb77c..ee264a7 100644 (file)
  * See the file ./license.txt
  */
 
-/**
- * INRIA 2008
- * Bruno JOFRET
- * Simone MANNORI
- */
 #include "gw_scicos.h"
-#include "stack-c.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include "localization.h"
 
 /*--------------------------------------------------------------------------*/
 typedef struct
@@ -34,20 +31,19 @@ typedef struct
 }  COSHLT_struct;
 extern COSHLT_struct  C2F(coshlt);
 /*--------------------------------------------------------------------------*/
-int sci_haltscicos(char *fname, unsigned long fname_len)
+int sci_haltscicos(char *fname, void* pvApiCtx)
 {
+    CheckInputArgument(pvApiCtx, 0, 0);
+    CheckOutputArgument(pvApiCtx, 0, 1);
 
-    //CheckLhs(0, 1);
-    //CheckRhs(0, 0);
-
-    //// MAGIC VALUE: 0 is used to continue the simulation
-    //// MAGIC VALUE: 1 is used to halt the simulator
-    //// MAGIC VALUE: 2 is used to switch to the final time
-    ////                        then halt the simulator
-    //C2F(coshlt).halt = 2;
+    // MAGIC VALUE: 0 is used to continue the simulation
+    // MAGIC VALUE: 1 is used to halt the simulator
+    // MAGIC VALUE: 2 is used to switch to the final time
+    //                        then halt the simulator
+    C2F(coshlt).halt = 2;
 
-    //LhsVar(1) = 0;
-    //PutLhsVar();
+    AssignOutputVariable(pvApiCtx, 1) = 0;
+    ReturnArguments(pvApiCtx);
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index 413dd37..3bce7ea 100644 (file)
 */
 
 #include "gw_scicos.h"
-#include "stack-c.h"
+#include "api_scilab.h"
+#include "Scierror.h"
+#include "localization.h"
 
 /*
  * Stub function to load the gateway
  */
-int sci_loadScicos(char *fname, unsigned long fname_len)
+int sci_loadScicos(char *fname, void* pvApiCtx)
 {
-    //CheckRhs(0, 1);
-    //LhsVar(1) = 0;
-    //PutLhsVar();
+    CheckInputArgument(pvApiCtx, 0, 0);
+    AssignOutputVariable(pvApiCtx, 1) = 0;
+    ReturnArguments(pvApiCtx);
     return 0;
 }
 
index 23e77d0..262cd10 100644 (file)
@@ -82,7 +82,7 @@ extern OpTab tabsim[];
 *                  check in/out size and type
 *
 */
-int sci_model2blk(char *fname, unsigned long fname_len)
+int sci_model2blk(char *fname, void* pvApiCtx)
 {
 #if 0
     int m1 = 0, n1 = 0;
index 815a927..987ac06 100644 (file)
@@ -29,7 +29,7 @@
 /*--------------------------------------------------------------------------*/
 extern COSIM_struct C2F(cosim);
 /*--------------------------------------------------------------------------*/
-int sci_phase_simulation(char *fname, unsigned long fname_len)
+int sci_phase_simulation(char *fname, void* pvApiCtx)
 {
     //int isrun = C2F(cosim).isrun;
 
index ef3089d..a8fed96 100644 (file)
@@ -34,7 +34,7 @@
 /* variable defined in scicos.c */
 extern COSIM_struct C2F(cosim);
 /*--------------------------------------------------------------------------*/
-int sci_pointer_xproperty(char *fname, unsigned long fname_len)
+int sci_pointer_xproperty(char *fname, void* pvApiCtx)
 {
     //int isrun = C2F(cosim).isrun;
 
index c06befa..c9a8516 100644 (file)
 #include "gw_scicos.h"
 #include "stack-c.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(scicosdebug) (char *fname, unsigned long fname_len); /* fortran */
+extern int C2F(scicosdebug) (char *fname, void* pvApiCtx); /* fortran */
 /*--------------------------------------------------------------------------*/
-int sci_scicos_debug(char *fname, unsigned long fname_len)
+int sci_scicos_debug(char *fname, void* pvApiCtx)
 {
-    //C2F(scicosdebug)(fname, fname_len);
+    //C2F(scicosdebug)(fname, pvApiCtx);
     //PutLhsVar();
     return 0;
 }
index 351ef46..61354d7 100644 (file)
 #include "gw_scicos.h"
 #include "stack-c.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(scicosdebugcount) (char *fname, unsigned long fname_len); /* fortran */
+extern int C2F(scicosdebugcount) (char *fname, void* pvApiCtx); /* fortran */
 /*--------------------------------------------------------------------------*/
-int sci_scicos_debug_count(char *fname, unsigned long fname_len)
+int sci_scicos_debug_count(char *fname, void* pvApiCtx)
 {
-    //C2F(scicosdebugcount)(fname, fname_len);
+    //C2F(scicosdebugcount)(fname, pvApiCtx);
     //PutLhsVar();
     return 0;
 }
index 7faf0ab..4b349f3 100644 (file)
@@ -24,7 +24,7 @@
 #include "stack-c.h"
 #include "scicos.h"
 /*--------------------------------------------------------------------------*/
-int sci_scicos_time(char *fname, unsigned long fname_len)
+int sci_scicos_time(char *fname, void* pvApiCtx)
 {
 #if 0
     int one = 1, l1 = 0;
index be0cb9f..d8e4c45 100644 (file)
@@ -167,7 +167,7 @@ extern int C2F(namstr)();
 /* variable defined in scicos.c */
 extern CURBLK_struct C2F(curblk);
 /*--------------------------------------------------------------------------*/
-int sci_scicosim(char *fname, unsigned long fname_len)
+int sci_scicosim(char *fname, void* pvApiCtx)
 {
 #if 0
     /************************************
@@ -1956,7 +1956,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
 
             switch (subheader[0]) /*store type and address*/
             {
-                    /*matrix of double*/
+                /*matrix of double*/
                 case 1  :
                     switch (subheader[3])
                     {
@@ -1983,7 +1983,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
                     }
                     break;
 
-                    /*matrix of integers*/
+                /*matrix of integers*/
                 case 8  :
                     switch (subheader[3])
                     {
@@ -2103,7 +2103,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
 
             switch (subheader[0]) /*store type and address*/
             {
-                    /*matrix of double*/
+                /*matrix of double*/
                 case 1  :
                     switch (subheader[3])
                     {
@@ -2130,7 +2130,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
                     }
                     break;
 
-                    /*matrix of integers*/
+                /*matrix of integers*/
                 case 8  :
                     switch (subheader[3])
                     {
@@ -2266,7 +2266,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
 
             switch (subheader[0]) /*store type and address*/
             {
-                    /*matrix of double*/
+                /*matrix of double*/
                 case 1  :
                     switch (subheader[3])
                     {
@@ -2300,7 +2300,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
                     }
                     break;
 
-                    /*matrix of integers*/
+                /*matrix of integers*/
                 case 8  :
                     switch (subheader[3])
                     {
@@ -2628,7 +2628,7 @@ int sci_scicosim(char *fname, unsigned long fname_len)
             case 26  :
                 error = _("The number of parameter provided by Scicos blocks is different from what expected by the code generated by the Modelica compiler. You might have relaxed a parameter using FIXED property (i.e., fixed=false) in a Modelica model. This will be corrected in the next version");
                 break;
-                /*In this case, you need to turn off the parameter embedded code generation mode by setting Modelica_ParEmb=%f in the Scilab command window, and  recompile the Scicos diagram*/
+            /*In this case, you need to turn off the parameter embedded code generation mode by setting Modelica_ParEmb=%f in the Scilab command window, and  recompile the Scicos diagram*/
 
             default  :
                 if (ierr >= 1000)
index 3b86a18..130e7f3 100644 (file)
 #include "machine.h" /* C2F */
 #include "gw_scicos.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intctree)(char *fname, unsigned long fname_len); /* fortran */
+extern int C2F(intctree)(char *fname, void* pvApiCtx); /* fortran */
 /*--------------------------------------------------------------------------*/
-int sci_sctree(char *fname, unsigned long fname_len)
+int sci_sctree(char *fname, void* pvApiCtx)
 {
-    C2F(intctree)(fname, fname_len);
+    C2F(intctree)(fname, pvApiCtx);
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index 932f0c7..bf415cb 100644 (file)
@@ -29,7 +29,7 @@
 /*--------------------------------------------------------------------------*/
 extern COSIM_struct C2F(cosim);
 /*--------------------------------------------------------------------------*/
-int sci_set_blockerror(char *fname, unsigned long fname_len)
+int sci_set_blockerror(char *fname, void* pvApiCtx)
 {
 #if 0
     int one = 1, l1 = 0;
index 5d32c77..a468592 100644 (file)
@@ -29,7 +29,7 @@
 /* variable defined in scicos.c */
 extern COSIM_struct C2F(cosim);
 /*--------------------------------------------------------------------------*/
-int sci_set_xproperty(char *fname, unsigned long fname_len)
+int sci_set_xproperty(char *fname, void* pvApiCtx)
 {
     //int isrun = C2F(cosim).isrun;
 
index 2fd51fe..791bf23 100644 (file)
@@ -73,7 +73,7 @@ extern int *listentry(int *header, int i);
 * initial rev 08/11/07, Alan
 *
 */
-int sci_sig2data(char *fname, unsigned long fname_len)
+int sci_sig2data(char *fname, void* pvApiCtx)
 {
     //int m1 = 0, n1 = 0;
     //int *il1 = NULL;
index 30f4624..311fd3b 100644 (file)
 #include "machine.h" /* C2F */
 #include "gw_scicos.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intvar2vec)(char *fname, unsigned long fname_len); /* fortran */
+extern int C2F(intvar2vec)(char *fname, void* pvApiCtx); /* fortran */
 /*--------------------------------------------------------------------------*/
-int sci_var2vec(char *fname, unsigned long fname_len)
+int sci_var2vec(char *fname, void* pvApiCtx)
 {
-    C2F(intvar2vec)(fname, fname_len);
+    C2F(intvar2vec)(fname, pvApiCtx);
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index 810607a..e9b2ce0 100644 (file)
 #include "machine.h" /* C2F */
 #include "gw_scicos.h"
 /*--------------------------------------------------------------------------*/
-extern int C2F(intvec2var)(char *fname, unsigned long fname_len); /* fortran subroutine */
+extern int C2F(intvec2var)(char *fname, void* pvApiCtx); /* fortran subroutine */
 /*--------------------------------------------------------------------------*/
-int sci_vec2var(char *fname, unsigned long fname_len)
+int sci_vec2var(char *fname, void* pvApiCtx)
 {
-    C2F(intvec2var)(fname, fname_len);
+    C2F(intvec2var)(fname, pvApiCtx);
     return 0;
 }
 /*--------------------------------------------------------------------------*/
index 1d2c09d..f6e2030 100644 (file)
@@ -1,61 +1,54 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
-<!DOCTYPE GATEWAY SYSTEM "../../functions/xml/gateway.dtd">
-<GATEWAY name="scicos">
-    <!-- =================== -->
-    <!--
- Scilab
- Interface description. In this file, we define the list of the function which
- will be available into Scilab and the link to the "native" function.
-
- gatewayId is the position in the hashtable 'Interfaces' defined in the
- file SCI/modules/core/src/c/callinterf.h
-
- primitiveId is the position in the hashtable '<module>Table Tab[]' defined
- in the file modules/<module>/sci_gateway/c/gw_<module>.c
-
- primitiveName is the name of the Scilab function
-
- @author Allan CORNET
- @author Sylvestre LEDRU
- @date INRIA 2007
- ===================
- Don't touch if you do not know what you are doing
--->
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="45" primitiveId="1" primitiveName="var2vec" />
-    <PRIMITIVE gatewayId="45" primitiveId="2" primitiveName="vec2var" />
-    <PRIMITIVE gatewayId="45" primitiveId="3" primitiveName="getblocklabel" />
-    <PRIMITIVE gatewayId="45" primitiveId="4" primitiveName="scicos_debug" />
-    <PRIMITIVE gatewayId="45" primitiveId="5" primitiveName="scicos_debug_count" />
-    <PRIMITIVE gatewayId="45" primitiveId="6" primitiveName="sctree" />
-    <PRIMITIVE gatewayId="45" primitiveId="7" primitiveName="sci_tree2" />
-    <PRIMITIVE gatewayId="45" primitiveId="8" primitiveName="sci_tree3" />
-    <PRIMITIVE gatewayId="45" primitiveId="9" primitiveName="sci_tree4" />
-    <PRIMITIVE gatewayId="45" primitiveId="10" primitiveName="curblock" />
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="45" primitiveId="11" primitiveName="scicos_time" />
-    <PRIMITIVE gatewayId="45" primitiveId="12" primitiveName="duplicate" />
-    <PRIMITIVE gatewayId="45" primitiveId="13" primitiveName="diffobjs" />
-    <PRIMITIVE gatewayId="45" primitiveId="14" primitiveName="pointer_xproperty" />
-    <PRIMITIVE gatewayId="45" primitiveId="15" primitiveName="phase_simulation" />
-    <PRIMITIVE gatewayId="45" primitiveId="16" primitiveName="set_xproperty" />
-    <PRIMITIVE gatewayId="45" primitiveId="17" primitiveName="set_blockerror" />
-    <PRIMITIVE gatewayId="45" primitiveId="18" primitiveName="ctree2" />
-    <PRIMITIVE gatewayId="45" primitiveId="19" primitiveName="ctree3" />
-    <PRIMITIVE gatewayId="45" primitiveId="20" primitiveName="ctree4" />
-    <PRIMITIVE gatewayId="45" primitiveId="21" primitiveName="scicosim" />
-    <PRIMITIVE gatewayId="45" primitiveId="22" primitiveName="getscicosvars" />
-    <PRIMITIVE gatewayId="45" primitiveId="23" primitiveName="curblockc" />
-    <PRIMITIVE gatewayId="45" primitiveId="24" primitiveName="buildouttb" />
-    <PRIMITIVE gatewayId="45" primitiveId="25" primitiveName="end_scicosim" />
-    <PRIMITIVE gatewayId="45" primitiveId="26" primitiveName="coserror" />
-    <PRIMITIVE gatewayId="45" primitiveId="27" primitiveName="sci_haltscicos" />
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="45" primitiveId="28" primitiveName="data2sig" />
-    <PRIMITIVE gatewayId="45" primitiveId="29" primitiveName="sig2data" />
-    <PRIMITIVE gatewayId="45" primitiveId="30" primitiveName="model2blk" />
-    <PRIMITIVE gatewayId="45" primitiveId="31" primitiveName="callblk" />
-    <!-- =================== -->
-    <PRIMITIVE gatewayId="45" primitiveId="32" primitiveName="loadScicos" />
-</GATEWAY>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "../../functions/xml/gateway.dtd">
+<!--
+            /*
+            *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+            *  Copyright (C) 2014 - Scilab Enterprises - Clement DAVID
+            *
+            *  This file must be used under the terms of the CeCILL.
+            *  This source file is licensed as described in the file COPYING, which
+            *  you should have received as part of this distribution.  The terms
+            *  are also available at
+            *  http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+            *
+            */
+            Scilab
+            Interface description. In this file, we define the list of the function which
+            will be available into Scilab and the link to the "native" function.
+            
+            Don't touch if you do not know what you are doing !
+        -->
+<module name="scicos">
+    <gateway type="0" name="sci_var2vec" function="var2vec"/>
+    <gateway type="0" name="sci_vec2var" function="vec2var"/>
+    <gateway type="0" name="sci_getblocklabel" function="getblocklabel"/>
+    <gateway type="0" name="sci_scicos_debug" function="scicos_debug"/>
+    <gateway type="0" name="sci_scicos_debug_count" function="scicos_debug_count"/>
+    <gateway type="0" name="sci_sctree" function="sctree"/>
+    <gateway type="0" name="sci_tree2" function="sci_tree2"/>
+    <gateway type="0" name="sci_tree3" function="sci_tree3"/>
+    <gateway type="0" name="sci_tree4" function="sci_tree4"/>
+    <gateway type="0" name="sci_curblock" function="curblock"/>
+    <gateway type="0" name="sci_scicos_time" function="scicos_time"/>
+    <gateway type="0" name="sci_duplicate" function="duplicate"/>
+    <gateway type="0" name="sci_diffobjs" function="diffobjs"/>
+    <gateway type="0" name="sci_pointer_xproperty" function="pointer_xproperty"/>
+    <gateway type="0" name="sci_phase_simulation" function="phase_simulation"/>
+    <gateway type="0" name="sci_set_xproperty" function="set_xproperty"/>
+    <gateway type="0" name="sci_set_blockerror" function="set_blockerror"/>
+    <gateway type="0" name="sci_ctree2" function="ctree2"/>
+    <gateway type="0" name="sci_ctree3" function="ctree3"/>
+    <gateway type="0" name="sci_ctree4" function="ctree4"/>
+    <gateway type="0" name="sci_scicosim" function="scicosim"/>
+    <gateway type="0" name="sci_getscicosvars" function="getscicosvars"/>
+    <gateway type="0" name="sci_curblockc" function="curblockc"/>
+    <gateway type="0" name="sci_buildouttb" function="buildouttb"/>
+    <gateway type="0" name="sci_end_scicosim" function="end_scicosim"/>
+    <gateway type="0" name="sci_coserror" function="coserror"/>
+    <gateway type="0" name="sci_haltscicos" function="sci_haltscicos"/>
+    <gateway type="0" name="sci_data2sig" function="data2sig"/>
+    <gateway type="0" name="sci_sig2data" function="sig2data"/>
+    <gateway type="0" name="sci_model2blk" function="model2blk"/>
+    <gateway type="0" name="sci_callblk" function="callblk"/>
+    <gateway type="0" name="sci_loadScicos" function="loadScicos"/>
+</module>
index abf6a44..d63da4c 100644 (file)
@@ -89,8 +89,7 @@
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Dynamic_link_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)dynamic_link.lib" 1&gt;NUL 2&gt;NUL
@@ -102,7 +101,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
 lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;core.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -132,8 +131,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Dynamic_link_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)dynamic_link.lib" 1&gt;NUL 2&gt;NUL
@@ -145,7 +143,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
 lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;core.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -175,8 +173,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Dynamic_link_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)dynamic_link.lib" 1&gt;NUL 2&gt;NUL
@@ -188,7 +185,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
 lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;core.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -223,8 +220,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)Scicos_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos_f.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)String_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Dynamic_link_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)dynamic_link.lib" 1&gt;NUL 2&gt;NUL
@@ -236,7 +232,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
 lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)differential_equations_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;core.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/blasplus.lib;../../../../bin/linpack_f.lib;output_stream.lib;string.lib;dynamic_link.lib;graphics.lib;scicos_blocks_f.lib;scicos_f.lib;scilocalization.lib;elementary_functions_f.lib;core_f.lib;differential_equations_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -304,6 +300,7 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ClCompile Include="scicos_free.c" />
     <ClCompile Include="scicos_malloc.c" />
     <ClCompile Include="scicos_print.c" />
+    <ClCompile Include="scilab5_needed_stubs.c" />
     <ClCompile Include="tree.c" />
     <ClCompile Include="var2sci.c" />
   </ItemGroup>
@@ -360,6 +357,9 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
     <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
       <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
+      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\elementary_functions\src\c\elementary_functions.vcxproj">
       <Project>{5b110267-7c18-437c-b87d-dba2b50729e9}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -384,4 +384,4 @@ lib /DEF:"$(ProjectDir)differential_equations_f_Import.def" /SUBSYSTEM:WINDOWS /
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
index 0bd066f..0c905af 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
     <ClCompile Include="var2sci.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="scilab5_needed_stubs.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="copyvarfromlistentry.h">
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/scicos/src/c/scilab5_needed_stubs.c b/scilab/modules/scicos/src/c/scilab5_needed_stubs.c
new file mode 100644 (file)
index 0000000..516a503
--- /dev/null
@@ -0,0 +1,124 @@
+#include <stdlib.h>
+#include "machine.h"
+#include "dynlib_scicos.h"
+
+SCICOS_IMPEXP void F2C(syncexec)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(GetCommand)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(ismenu)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(errgst)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(check_dims)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(check_scalar)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(createvarfromptr)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(namstr)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(iop)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(createlistcvarfromptr)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(GetData)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(createlistvarfromptr)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(xscion)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(getrhsvar)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(vartype)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(checklhs)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(callFunctionFromGateway)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(str2sci)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(com)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(createdata)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(listentry)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(putlhsvar)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(intersci)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(checkrhs)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(createvar)()
+{
+    abort();
+}
+
+#ifndef _MSC_VER
+SCICOS_IMPEXP void F2C(vstk)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(cha1)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(stack)()
+{
+    abort();
+}
+SCICOS_IMPEXP void F2C(ierode)()
+{
+    abort();
+}
+
+#endif
index 98fb07b..018fa5b 100644 (file)
@@ -10,3 +10,8 @@ cosdebugcounter_
 scsptr_
 cosdebug_
 getscilabel_
+putlhsvar_
+createvar_
+checklhs_
+checkrhs_
+getrhsvar_
\ No newline at end of file
diff --git a/scilab/modules/scicos/src/fortran/core_Import.def b/scilab/modules/scicos/src/fortran/core_Import.def
deleted file mode 100644 (file)
index 184c996..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-LIBRARY    core.dll
-
-
-EXPORTS
-;
-;core
-stack_
-intersci_
-vstk_
-iop_
-errgst_
-com_ 
-cha1_
-recu_
-checklhs_ 
-checkrhs_
-getrhsvar_
-createvar_
-putlhsvar_
-parse_
-isrecursioncalltofunction_
-callinterf_
-
-;
-; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol 
-;
-adre_
-;
-
-
index fcf4074..71c7a29 100644 (file)
@@ -6,7 +6,7 @@
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -18,8 +18,7 @@ for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
 copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
@@ -28,7 +27,7 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X8
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -40,8 +39,7 @@ for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
 copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
@@ -50,7 +48,7 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X8
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -62,8 +60,7 @@ for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
 copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
@@ -72,7 +69,7 @@ lib /DEF:&quot;$(InputDir)core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X6
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib scicos.lib elementary_functions.lib elementary_functions_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
@@ -84,8 +81,7 @@ for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
 copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
 del *.def &gt;nul
 cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
 lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
index 77056f8..f7e1240 100644 (file)
@@ -57,7 +57,8 @@ C
 C     
       icall = 5
       krec = -1
-      include "callinter.h.f"
+C      FIXME implement for YaSp
+C      include "callinter.h.f"
  200  lhs = ids(1,pt)
       rhs = ids(2,pt)
       pt = pt - 1
index a2943a1..6f7244d 100644 (file)
@@ -88,8 +88,7 @@
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Linear_algebra_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)linear_algebra_f.lib" 1&gt;NUL 2&gt;NUL
@@ -98,7 +97,7 @@ lib /DEF:"$(ProjectDir)polynomials_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(P
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;core.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -124,8 +123,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Linear_algebra_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)linear_algebra_f.lib" 1&gt;NUL 2&gt;NUL
@@ -134,7 +132,7 @@ lib /DEF:"$(ProjectDir)polynomials_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(P
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;core.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <IgnoreSpecificDefaultLibraries>
       </IgnoreSpecificDefaultLibraries>
@@ -160,8 +158,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Linear_algebra_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)linear_algebra_f.lib" 1&gt;NUL 2&gt;NUL
@@ -170,7 +167,7 @@ lib /DEF:"$(ProjectDir)polynomials_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(P
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;core.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -201,8 +198,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </ClCompile>
     <PreLinkEvent>
       <Message>Make dependencies</Message>
-      <Command>lib /DEF:"$(ProjectDir)core_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)core.lib" 1&gt;NUL 2&gt;NUL
-lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
+      <Command>lib /DEF:"$(ProjectDir)scicos_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)scicos.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)string_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)string.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Output_stream_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)output_stream.lib" 1&gt;NUL 2&gt;NUL
 lib /DEF:"$(ProjectDir)Linear_algebra_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)linear_algebra_f.lib" 1&gt;NUL 2&gt;NUL
@@ -211,7 +207,7 @@ lib /DEF:"$(ProjectDir)polynomials_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(P
 lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform) /OUT:"$(ProjectDir)elementary_functions_f.lib" 1&gt;NUL 2&gt;NUL</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;core.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>../../../../bin/libintl.lib;../../../../bin/lapack.lib;../../../../bin/blasplus.lib;scicos.lib;output_stream.lib;string.lib;linear_algebra_f.lib;slicot_f.lib;polynomials_f.lib;elementary_functions_f.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(SolutionDir)bin\$(ProjectName).dll</OutputFile>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Windows</SubSystem>
@@ -586,6 +582,9 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ProjectReference Include="..\..\..\commons\src\c\commons.vcxproj">
       <Project>{eca09a1e-6d12-4a47-92e1-a671c181df77}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
+      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\fileio\fileio.vcxproj">
       <Project>{4fc72d4a-80ee-4b1a-8724-0201c1a35621}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
@@ -620,4 +619,4 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/scilab/modules/scicos_blocks/src/fortran/core_Import.def b/scilab/modules/scicos_blocks/src/fortran/core_Import.def
deleted file mode 100644 (file)
index 6eaf416..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-       LIBRARY    core.dll
-
-
-EXPORTS
-;
-;core
-;
-; import required by F2C
-ierode_
-;
-iop_
-recu_
-com_
-vstk_
-errgst_
-cha1_
-parse_
-isrecursioncalltofunction_
-callinterf_
-;
-; explicit imports (COMMON) to fix warning LNK4049: locally defined symbol 
-;
-stack_
-adre_
-intersci_
-;
-
index d199c66..8212ad8 100644 (file)
@@ -95,7 +95,8 @@ C
 C
       icall = 5
       krec = -1
-      include "callinter.h.f"
+C      FIXME implement for YaSp
+C      include "callinter.h.f"
  200  lhs = ids(1,pt)
       rhs = ids(2,pt)
       flag= ids(3,pt)
index 562ee2c..0b8bd87 100644 (file)
        <Configurations>
                <Configuration Name="Debug|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|Win32" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Debug|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" GenerateDebugInformation="true" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration>
                <Configuration Name="Release|x64" OutputDirectory="$(SolutionDir)bin\" IntermediateDirectory="$(ProjectDir)$(ConfigurationName)" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.dll;$(TargetPath)" ConfigurationType="typeDynamicLibrary">
                                <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"/>
-                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib core.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
+                               <Tool Name="VFLinkerTool" OutputFile="$(SolutionDir)bin\$(ProjectName).dll" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" ModuleDefinitionFile="scicos_blocks_f.def" SubSystem="subSystemWindows" ImportLibrary="$(SolutionDir)bin\$(ProjectName).lib" LinkDLL="true" AdditionalDependencies="../../../../bin/blasplus.lib output_stream.lib string.lib scicos_f.lib scicos.lib  output_stream_f.lib elementary_functions.lib elementary_functions_f.lib polynomials_f.lib core_f.lib"/>
                                <Tool Name="VFResourceCompilerTool"/>
                                <Tool Name="VFMidlTool" SuppressStartupBanner="true" HeaderFileName="$(InputName).h" TypeLibraryName="$(IntDir)/$(InputName).tlb"/>
                                <Tool Name="VFCustomBuildTool"/>
-                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion
-cd $(ConfigurationName)
-set LIST_OBJ=
-for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f
-&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%
-copy $(ProjectName).def ..\$(ProjectName).def &gt;nul
-del *.def &gt;nul
-cd .." Description="Build $(ProjectName).def"/>
-                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)core_import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL
-lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
+                               <Tool Name="VFPreLinkEventTool" CommandLine="setlocal EnableDelayedExpansion&#xA;cd $(ConfigurationName)&#xA;set LIST_OBJ=&#xA;for %%f in (*.obj) do set LIST_OBJ=!LIST_OBJ! %%f&#xA;&quot;$(SolutionDir)bin\dumpexts&quot; -o $(ProjectName).def $(ProjectName).dll %LIST_OBJ%&#xA;copy $(ProjectName).def ..\$(ProjectName).def &gt;nul&#xA;del *.def &gt;nul&#xA;cd .." Description="Build $(ProjectName).def"/>
+                               <Tool Name="VFPreBuildEventTool" CommandLine="lib /DEF:&quot;$(InputDir)Core_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)core_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Output_stream_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)output_stream_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)String_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)string.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)scicos_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)Scicos_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)scicos.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)elementary_functions_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)elementary_functions_f.lib&quot; 1&gt;NUL 2&gt;NUL&#xA;lib /DEF:&quot;$(InputDir)polynomials_f_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X64 /OUT:&quot;$(InputDir)polynomials_f.lib&quot; 1&gt;NUL 2&gt;NUL" Description="Build Dependencies"/>
                                <Tool Name="VFPostBuildEventTool"/>
                                <Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
        <Files>
                <Filter Name="Header Files" Filter="fi;fd"/>
                <Filter Name="Libraries Dependencies">
                <File RelativePath=".\Core_f_Import.def"/>
-               <File RelativePath=".\core_import.def"/>
                <File RelativePath=".\Elementary_functions_f_Import.def"/>
                <File RelativePath=".\Elementary_functions_Import.def"/>
                <File RelativePath=".\Output_stream_f_Import.def"/>