summaryrefslogtreecommitdiffstats
path: root/scilab/modules/helptools
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-02-02 16:50:46 +0100
commit4543a005198ee3197c08e553378430c9bc590911 (patch)
treef48aacd7ed42e1a1b0f13d95fa7185fe4b6afde7 /scilab/modules/helptools
parent7262c7b88b413c8a0b09bb0a627d613cdca3f845 (diff)
parent97de4eee52d09735f550d4c632fba106d0cc1762 (diff)
downloadscilab-4543a005198ee3197c08e553378430c9bc590911.zip
scilab-4543a005198ee3197c08e553378430c9bc590911.tar.gz
Merge remote branch 'origin/master' into textrendering
Conflicts: scilab/configure
Diffstat (limited to 'scilab/modules/helptools')
-rw-r--r--scilab/modules/helptools/Makefile.in4
-rw-r--r--scilab/modules/helptools/helptools.iss11
-rw-r--r--scilab/modules/helptools/src/c/helptools.vcproj4
3 files changed, 6 insertions, 13 deletions
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index dcdaa02..3806c2e 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -187,6 +187,7 @@ AVALON_FRAMEWORK = @AVALON_FRAMEWORK@
187AWK = @AWK@ 187AWK = @AWK@
188BATIK = @BATIK@ 188BATIK = @BATIK@
189BLAS_LIBS = @BLAS_LIBS@ 189BLAS_LIBS = @BLAS_LIBS@
190BSH = @BSH@
190CC = @CC@ 191CC = @CC@
191CCDEPMODE = @CCDEPMODE@ 192CCDEPMODE = @CCDEPMODE@
192CFLAGS = @CFLAGS@ 193CFLAGS = @CFLAGS@
@@ -260,6 +261,7 @@ JLATEXMATH_FOP = @JLATEXMATH_FOP@
260JOGL = @JOGL@ 261JOGL = @JOGL@
261JROSETTA_API = @JROSETTA_API@ 262JROSETTA_API = @JROSETTA_API@
262JROSETTA_ENGINE = @JROSETTA_ENGINE@ 263JROSETTA_ENGINE = @JROSETTA_ENGINE@
264JUNIT = @JUNIT@
263LAPACK_LIBS = @LAPACK_LIBS@ 265LAPACK_LIBS = @LAPACK_LIBS@
264LD = @LD@ 266LD = @LD@
265LDFLAGS = @LDFLAGS@ 267LDFLAGS = @LDFLAGS@
@@ -316,6 +318,7 @@ PVM_ENABLE = @PVM_ENABLE@
316PVM_INCLUDE = @PVM_INCLUDE@ 318PVM_INCLUDE = @PVM_INCLUDE@
317PVM_LIB = @PVM_LIB@ 319PVM_LIB = @PVM_LIB@
318PYTHON = @PYTHON@ 320PYTHON = @PYTHON@
321QDOX = @QDOX@
319RANLIB = @RANLIB@ 322RANLIB = @RANLIB@
320RELOCATABLE = @RELOCATABLE@ 323RELOCATABLE = @RELOCATABLE@
321RT_LIB = @RT_LIB@ 324RT_LIB = @RT_LIB@
@@ -334,6 +337,7 @@ SWIG_JAVA = @SWIG_JAVA@
334SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@ 337SWIG_RUNTIME_LIBS_DIR = @SWIG_RUNTIME_LIBS_DIR@
335TCLTK_LIBS = @TCLTK_LIBS@ 338TCLTK_LIBS = @TCLTK_LIBS@
336TCL_INC_PATH = @TCL_INC_PATH@ 339TCL_INC_PATH = @TCL_INC_PATH@
340TESTNG = @TESTNG@
337TK_INC_PATH = @TK_INC_PATH@ 341TK_INC_PATH = @TK_INC_PATH@
338UMFPACK_ENABLE = @UMFPACK_ENABLE@ 342UMFPACK_ENABLE = @UMFPACK_ENABLE@
339UMFPACK_LIB = @UMFPACK_LIB@ 343UMFPACK_LIB = @UMFPACK_LIB@
diff --git a/scilab/modules/helptools/helptools.iss b/scilab/modules/helptools/helptools.iss
index 880bb9c..d18dc96 100644
--- a/scilab/modules/helptools/helptools.iss
+++ b/scilab/modules/helptools/helptools.iss
@@ -47,23 +47,12 @@ Source: thirdparty\fop-hyph.README;DestDir: {app}\thirdparty; Components: {#COMP
47Source: thirdparty\fop.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 47Source: thirdparty\fop.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
48Source: thirdparty\fop.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 48Source: thirdparty\fop.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
49Source: thirdparty\fop.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 49Source: thirdparty\fop.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
50Source: thirdparty\isorelax.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
51Source: thirdparty\jeuclid-core.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 50Source: thirdparty\jeuclid-core.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
52Source: thirdparty\jeuclid.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 51Source: thirdparty\jeuclid.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
53Source: thirdparty\jeuclid.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 52Source: thirdparty\jeuclid.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
54Source: thirdparty\jimi.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
55Source: thirdparty\jimi.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
56Source: thirdparty\jimi.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
57Source: thirdparty\jing.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
58Source: thirdparty\jing.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
59Source: thirdparty\jing.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
60Source: thirdparty\js.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
61Source: thirdparty\js.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
62Source: thirdparty\js.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
63Source: thirdparty\saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 53Source: thirdparty\saxon.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
64Source: thirdparty\saxon.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 54Source: thirdparty\saxon.LICENSE;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
65Source: thirdparty\saxon.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 55Source: thirdparty\saxon.README;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
66Source: thirdparty\xercesImpl.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
67Source: thirdparty\xml-apis.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 56Source: thirdparty\xml-apis.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
68Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 57Source: thirdparty\xml-apis-ext.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
69Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB} 58Source: thirdparty\xmlgraphics-commons-1.3.1.jar;DestDir: {app}\thirdparty; Components: {#COMPN_SCILAB}
diff --git a/scilab/modules/helptools/src/c/helptools.vcproj b/scilab/modules/helptools/src/c/helptools.vcproj
index 4cac9c4..b7e4d7b 100644
--- a/scilab/modules/helptools/src/c/helptools.vcproj
+++ b/scilab/modules/helptools/src/c/helptools.vcproj
@@ -43,7 +43,7 @@
43 /> 43 />
44 <Tool 44 <Tool
45 Name="VCCLCompilerTool" 45 Name="VCCLCompilerTool"
46 AdditionalOptions="/arch:IA32" 46 AdditionalOptions=""
47 Optimization="0" 47 Optimization="0"
48 AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes" 48 AdditionalIncludeDirectories=".;../jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../includes;../../../../libs/MALLOC/includes;../../../../libs/hashtable;../../../core/includes;../../../graphics/includes;../../../graphic_export/includes;../../../graphics/src/c/getHandleProperty;../../../renderer/src/cpp;../../../renderer/src/jni;../../../localization/includes;../../../jvm/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../../libs/intl;../../../../libs/doublylinkedlist/includes;../../../string/includes;../../../windows_tools/includes;../../../renderer/includes;../../../api_scilab/includes"
49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS" 49 PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HELPTOOLS_EXPORTS"
@@ -210,7 +210,7 @@
210 /> 210 />
211 <Tool 211 <Tool
212 Name="VCCLCompilerTool" 212 Name="VCCLCompilerTool"
213 AdditionalOptions="/arch:IA32" 213 AdditionalOptions=""
214 InlineFunctionExpansion="1" 214 InlineFunctionExpansion="1"
215 FavorSizeOrSpeed="1" 215 FavorSizeOrSpeed="1"
216 WholeProgramOptimization="false" 216 WholeProgramOptimization="false"