summaryrefslogtreecommitdiffstats
path: root/scilab/modules/dynamic_link
diff options
context:
space:
mode:
authorAllan CORNET <allan.cornet@scilab.org>2010-02-15 11:30:21 +0100
committerAllan CORNET <allan.cornet@scilab.org>2010-02-15 11:30:21 +0100
commit851ec39987fc03dfedc4b1a2c1df3e7e68fa0079 (patch)
tree8968ec339621f0dd25345c883fa9400f13f184b2 /scilab/modules/dynamic_link
parent34a00e821bad47bce84ff97063a1916f67dc7625 (diff)
parentc2713aecd0de9cdb32273fb80245047ca35e5d8f (diff)
downloadscilab-851ec39987fc03dfedc4b1a2c1df3e7e68fa0079.zip
scilab-851ec39987fc03dfedc4b1a2c1df3e7e68fa0079.tar.gz
merge with master
Diffstat (limited to 'scilab/modules/dynamic_link')
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/dynamic_link.iss2
-rw-r--r--scilab/modules/dynamic_link/etc/dynamic_link.quit5
-rw-r--r--scilab/modules/dynamic_link/etc/dynamic_link.start6
4 files changed, 1 insertions, 13 deletions
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 25bed5d..c7bcce2 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -250,6 +250,7 @@ JGRAPHX = @JGRAPHX@
250JHALL = @JHALL@ 250JHALL = @JHALL@
251JHDF5 = @JHDF5@ 251JHDF5 = @JHDF5@
252JLATEXMATH = @JLATEXMATH@ 252JLATEXMATH = @JLATEXMATH@
253JLATEXMATH_FOP = @JLATEXMATH_FOP@
253JOGL = @JOGL@ 254JOGL = @JOGL@
254JROSETTA_API = @JROSETTA_API@ 255JROSETTA_API = @JROSETTA_API@
255JROSETTA_ENGINE = @JROSETTA_ENGINE@ 256JROSETTA_ENGINE = @JROSETTA_ENGINE@
diff --git a/scilab/modules/dynamic_link/dynamic_link.iss b/scilab/modules/dynamic_link/dynamic_link.iss
index aefaad1..775c0f5 100644
--- a/scilab/modules/dynamic_link/dynamic_link.iss
+++ b/scilab/modules/dynamic_link/dynamic_link.iss
@@ -32,8 +32,6 @@ Source: modules\{#DYNAMIC_LINK}\etc\{#DYNAMIC_LINK}.start; DestDir: {app}\module
32; 32;
33Source: modules\{#DYNAMIC_LINK}\sci_gateway\dynamic_link_gateway.xml; DestDir: {app}\modules\{#DYNAMIC_LINK}\sci_gateway; Components: {#COMPN_SCILAB} 33Source: modules\{#DYNAMIC_LINK}\sci_gateway\dynamic_link_gateway.xml; DestDir: {app}\modules\{#DYNAMIC_LINK}\sci_gateway; Components: {#COMPN_SCILAB}
34; 34;
35Source: modules\{#DYNAMIC_LINK}\help\addchapter.sce; DestDir: {app}\modules\{#DYNAMIC_LINK}\help; Flags: recursesubdirs; Components: {#COMPN_SCILAB}
36;
37Source: modules\{#DYNAMIC_LINK}\src\scripts\Makedll.incl; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB} 35Source: modules\{#DYNAMIC_LINK}\src\scripts\Makedll.incl; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB}
38Source: modules\{#DYNAMIC_LINK}\src\scripts\TEMPLATE_MAKEFILE.VC; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB} 36Source: modules\{#DYNAMIC_LINK}\src\scripts\TEMPLATE_MAKEFILE.VC; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB}
39Source: modules\{#DYNAMIC_LINK}\src\scripts\TEMPLATE_MAKEFILE.LCC; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB} 37Source: modules\{#DYNAMIC_LINK}\src\scripts\TEMPLATE_MAKEFILE.LCC; DestDir: {app}\modules\{#DYNAMIC_LINK}\src\scripts; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/dynamic_link/etc/dynamic_link.quit b/scilab/modules/dynamic_link/etc/dynamic_link.quit
index 32c8745..8793346 100644
--- a/scilab/modules/dynamic_link/etc/dynamic_link.quit
+++ b/scilab/modules/dynamic_link/etc/dynamic_link.quit
@@ -11,8 +11,3 @@
11// free all dynamics libraries 11// free all dynamics libraries
12ulink(); 12ulink();
13// ============================================================================= 13// =============================================================================
14// Delete help chapter
15// =============================================================================
16if WITH_HELPTOOLS then
17 del_help_chapter("dynamic_link",%t);
18end
diff --git a/scilab/modules/dynamic_link/etc/dynamic_link.start b/scilab/modules/dynamic_link/etc/dynamic_link.start
index 18d871f..ff4b8ed 100644
--- a/scilab/modules/dynamic_link/etc/dynamic_link.start
+++ b/scilab/modules/dynamic_link/etc/dynamic_link.start
@@ -36,12 +36,6 @@ if MSDOS then
36 clear findmsvccompiler 36 clear findmsvccompiler
37end 37end
38 38
39// Add help chapter
40// =============================================================================
41if WITH_HELPTOOLS then
42 add_module_help_chapter("dynamic_link");
43end
44
45// Add demos 39// Add demos
46// ============================================================================= 40// =============================================================================
47if WITH_DEMOS then 41if WITH_DEMOS then