summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-11-04 15:51:07 +0100
committerClément DAVID <clement.david@scilab.org>2010-11-04 17:56:06 +0100
commit9a0e57284d5a486117efa0e848efd400103a5960 (patch)
tree0c9ac42406ff4c114360b1718e9651095ee3505e /scilab/modules
parent6f9facd6239b66ea53d19e37ea15a73434f1913d (diff)
downloadscilab-9a0e57284d5a486117efa0e848efd400103a5960.zip
scilab-9a0e57284d5a486117efa0e848efd400103a5960.tar.gz
libscixcos loaded only when we load dynamic lib and not at startup nor close.
Change-Id: I5bc609c2701b863224db6b5f670f6ced1cb7b714
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.am2
-rw-r--r--scilab/modules/Makefile.in2
-rw-r--r--scilab/modules/xcos/sci_gateway/c/gw_xcos.c3
3 files changed, 4 insertions, 3 deletions
diff --git a/scilab/modules/Makefile.am b/scilab/modules/Makefile.am
index afd59ad..58da9cf 100644
--- a/scilab/modules/Makefile.am
+++ b/scilab/modules/Makefile.am
@@ -136,7 +136,6 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
136 $(top_builddir)/modules/console/libsciconsole.la \ 136 $(top_builddir)/modules/console/libsciconsole.la \
137 $(top_builddir)/modules/action_binding/libsciaction_binding.la \ 137 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
138 $(top_builddir)/modules/jvm/libscijvm.la \ 138 $(top_builddir)/modules/jvm/libscijvm.la \
139 $(top_builddir)/modules/xcos/libscixcos.la \
140 $(top_builddir)/modules/scinotes/libsciscinotes.la \ 139 $(top_builddir)/modules/scinotes/libsciscinotes.la \
141 $(top_builddir)/modules/ui_data/libsciui_data.la \ 140 $(top_builddir)/modules/ui_data/libsciui_data.la \
142 $(top_builddir)/modules/history_browser/libscihistory_browser.la \ 141 $(top_builddir)/modules/history_browser/libscihistory_browser.la \
@@ -207,6 +206,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
207 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 206 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
208 $(top_builddir)/modules/statistics/libscistatistics.la \ 207 $(top_builddir)/modules/statistics/libscistatistics.la \
209 $(top_builddir)/modules/randlib/libscirandlib.la \ 208 $(top_builddir)/modules/randlib/libscirandlib.la \
209 $(top_builddir)/modules/xcos/libscixcos.la \
210 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \ 210 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
211 $(top_builddir)/modules/scicos/libsciscicos.la \ 211 $(top_builddir)/modules/scicos/libsciscicos.la \
212 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 212 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 6fc5d69..d97cc40 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -476,7 +476,6 @@ GUI_LIBS = $(top_builddir)/modules/gui/libscigui.la \
476 $(top_builddir)/modules/console/libsciconsole.la \ 476 $(top_builddir)/modules/console/libsciconsole.la \
477 $(top_builddir)/modules/action_binding/libsciaction_binding.la \ 477 $(top_builddir)/modules/action_binding/libsciaction_binding.la \
478 $(top_builddir)/modules/jvm/libscijvm.la \ 478 $(top_builddir)/modules/jvm/libscijvm.la \
479 $(top_builddir)/modules/xcos/libscixcos.la \
480 $(top_builddir)/modules/scinotes/libsciscinotes.la \ 479 $(top_builddir)/modules/scinotes/libsciscinotes.la \
481 $(top_builddir)/modules/ui_data/libsciui_data.la \ 480 $(top_builddir)/modules/ui_data/libsciui_data.la \
482 $(top_builddir)/modules/history_browser/libscihistory_browser.la \ 481 $(top_builddir)/modules/history_browser/libscihistory_browser.la \
@@ -539,6 +538,7 @@ ENGINE_LIBS_DYNAMIC_LOAD = \
539 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \ 538 $(top_builddir)/modules/arnoldi/libsciarnoldi.la \
540 $(top_builddir)/modules/statistics/libscistatistics.la \ 539 $(top_builddir)/modules/statistics/libscistatistics.la \
541 $(top_builddir)/modules/randlib/libscirandlib.la \ 540 $(top_builddir)/modules/randlib/libscirandlib.la \
541 $(top_builddir)/modules/xcos/libscixcos.la \
542 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \ 542 $(top_builddir)/modules/scicos_blocks/libsciscicos_blocks.la \
543 $(top_builddir)/modules/scicos/libsciscicos.la \ 543 $(top_builddir)/modules/scicos/libsciscicos.la \
544 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \ 544 $(top_builddir)/modules/dynamic_link/libscidynamic_link.la \
diff --git a/scilab/modules/xcos/sci_gateway/c/gw_xcos.c b/scilab/modules/xcos/sci_gateway/c/gw_xcos.c
index 5a24500..21b4e52 100644
--- a/scilab/modules/xcos/sci_gateway/c/gw_xcos.c
+++ b/scilab/modules/xcos/sci_gateway/c/gw_xcos.c
@@ -51,7 +51,8 @@ int gw_xcos(void)
51 return 0; 51 return 0;
52 } 52 }
53 53
54 if (!loadedDep) 54 if (!loadedDep // never reload
55 && Tab[Fin-1].f != sci_closeXcosFromScilab) // do not load on close
55 { 56 {
56 loadOnUseClassPath("XCos"); 57 loadOnUseClassPath("XCos");
57 loadedDep = TRUE; 58 loadedDep = TRUE;