update VS solution with localization include
Allan Cornet [Mon, 5 Nov 2007 09:09:44 +0000 (09:09 +0000)]
localization.h added where needed

71 files changed:
scilab/modules/action_binding/src/c/action_binding.vcproj
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/completion/src/c/completion.vcproj
scilab/modules/completion/src/nocompletion/nocompletion.vcproj
scilab/modules/core/includes/machine.h.vc
scilab/modules/core/includes/sciprint.h
scilab/modules/core/src/c/CallScilab.c
scilab/modules/core/src/c/core.vcproj
scilab/modules/core/src/c/tmpdir.c
scilab/modules/fftw/fftw.vcproj
scilab/modules/fftw/sci_gateway/c/gw_fftw.c
scilab/modules/fftw/sci_gateway/c/sci_loadfftwlibrary.c
scilab/modules/fftw/src/nofftw/nofftw.vcproj
scilab/modules/fileio/fileio.vcproj
scilab/modules/fileio/src/c/mputstr.c
scilab/modules/history_manager/src/c/history_manager.vcproj
scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.c
scilab/modules/history_manager/src/nohistory_manager/nohistory_manager.vcproj
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/src/c/interpolation.vcproj
scilab/modules/io/src/c/io.vcproj
scilab/modules/jvm/libjvm.vcproj
scilab/modules/jvm/sci_gateway/c/gw_jvm.c
scilab/modules/jvm/sci_gateway/c/sci_javaclasspath.c
scilab/modules/jvm/sci_gateway/c/sci_javalibrarypath.c
scilab/modules/jvm/sci_gateway/c/sci_system_getproperty.c
scilab/modules/jvm/sci_gateway/c/sci_system_setproperty.c
scilab/modules/jvm/src/c/InitializeJVM.c
scilab/modules/jvm/src/c/JVM.c
scilab/modules/jvm/src/c/JVM_commons.c
scilab/modules/jvm/src/c/addToLibrarypath.c
scilab/modules/jvm/src/c/createMainScilabObject.c
scilab/modules/jvm/src/c/loadClasspath.c
scilab/modules/jvm/src/c/loadLibrarypath.c
scilab/modules/linear_algebra/src/c/linear_algebra.vcproj
scilab/modules/metanet/src/c/metanet.vcproj
scilab/modules/metanet/src/c/nometanet/nometanet.vcproj
scilab/modules/mexlib/src/libmat/libmat.vcproj
scilab/modules/mexlib/src/libmex/libmex.vcproj
scilab/modules/mexlib/src/libmx/libmx.vcproj
scilab/modules/optimization/src/c/optim.vcproj
scilab/modules/output_stream/includes/Scierror.h
scilab/modules/output_stream/src/c/output_stream.vcproj
scilab/modules/pvm/src/nopvm/nopvm.vcproj
scilab/modules/randlib/src/c/randlib.vcproj
scilab/modules/randlib/src/norandlib/norandlib.c
scilab/modules/randlib/src/norandlib/norandlib.vcproj
scilab/modules/renderer/renderer.vcproj
scilab/modules/renderer/src/cpp/polylineDrawing/PolylineArrowDrawerJoGL.cpp
scilab/modules/renderer/src/cpp/polylineDrawing/PolylineBarDrawerJoGL.cpp
scilab/modules/renderer/src/cpp/polylineDrawing/PolylineFillDrawerJoGL.cpp
scilab/modules/renderer/src/cpp/polylineDrawing/PolylineInterpColorDrawerJoGL.cpp
scilab/modules/renderer/src/cpp/polylineDrawing/PolylineLineDrawerJoGL.cpp
scilab/modules/renderer/src/cpp/polylineDrawing/PolylineMarkDrawerJoGL.cpp
scilab/modules/shell/src/c/shell.vcproj
scilab/modules/shell/src/c/windows/command.c
scilab/modules/sound/sound.vcproj
scilab/modules/sound/src/nosound/nosound.c
scilab/modules/sound/src/nosound/nosound.vcproj
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/spreadsheet/spreadsheet.vcproj
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.c
scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.vcproj
scilab/modules/statistics/src/c/statistics.vcproj
scilab/modules/symbolic/src/c/symbolic.vcproj
scilab/modules/tclsci/src/c/EnvTclTk.c
scilab/modules/tclsci/src/notclsci/notclsci.c
scilab/modules/tclsci/src/notclsci/notclsci.vcproj
scilab/modules/tclsci/tclsci.vcproj
scilab/modules/time/time.vcproj

index 58ce8bb..56c3607 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"\r
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"\r
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_EXPORTS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
index 3859361..e7154ab 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index adc9294..057a1bb 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../graphics/includes;../../../../libs/MALLOC/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 265c2c0..a6db36f 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOCOMPLETION_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOCOMPLETION_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 86ae34b..2bca999 100644 (file)
 
 #define HAVE_LIBINTL_H
 
-#ifdef HAVE_LIBINTL_H
-/* Have been able to find the libintl.h file on the system */
-#include <libintl.h>
-
-#define _(String) gettext (String)
-#define _t(String1,String2,n) ngettext (String1,String2,n)
-
-#else
-/* Restore the normal behaviour ... all the string will be in english */
-
-#define _(String) ((const char *) (String))
-#define gettext(String) ((const char *) (String))
-#define _t(String1,String2,n) ngettext (String1,String2,n)
-#define ngettext(String1, String2, n) ((n) == 1 ? (const char *) (String1) : (const char *) (String2))
-
-#endif
-
 #endif /* MACHINE_H  */
index 9e83981..e42d550 100644 (file)
@@ -7,7 +7,6 @@
 #define __SCIPRINT_H__
 
 #include <stdarg.h>
-#include "localization.h"
 
 /* any string of length greater than MAXPRINTF gets truncated in sciprint */
 #define MAXPRINTF 512
index fb04581..a59a5aa 100644 (file)
@@ -22,6 +22,7 @@
 #include "../../../windows_tools/src/c/scilab_windows/SetScilabEnvironmentVariables.h"
 #include "../../../windows_tools/src/c/scilab_windows/getScilabDirectory.h"
 #endif
+#include "localization.h"
 
 #ifdef _MSC_VER
 #define putenv _putenv
index 9263242..793f540 100644 (file)
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../../libs/intl;../../../action_binding/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../tclsci/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_DEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../../libs/intl;../../../action_binding/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../tclsci/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../string/includes;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../action_binding/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../tclsci/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                >
                        </File>
                        <File
-                               RelativePath=".\fromjava.h"
+                               RelativePath="..\..\includes\fromjava.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\fromjava.h"
+                               RelativePath=".\fromjava.h"
                                >
                        </File>
                        <File
index 7858899..61721a4 100644 (file)
@@ -30,6 +30,7 @@ extern  char  *getenv();
 #endif
 #include "prompt.h"
 #include "tmpdir.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/
 static char tmp_dir[256],buf[256];
 /*-----------------------------------------------------------------------------------*/
index 73d1cb3..3b66489 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
                                PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl;../../libs/dynamiclibrary/includes"
                                PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index a9cb4ca..1d3e51c 100644 (file)
@@ -8,6 +8,7 @@
 #include "fftwlibname.h"
 #include "gw_fftw.h"
 #include "callFunctionFromGateway.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 static gw_generic_table Tab[]={
 { sci_loadfftwlibrary,"loadfftwlibrary"},
index f3c9d8e..0f856e0 100644 (file)
@@ -7,6 +7,7 @@
 #include "Scierror.h"
 #include "fftwlibname.h"
 #include "gw_fftw.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 int sci_loadfftwlibrary __PARAMS((char *fname,unsigned long fname_len))
 {
index f5c1741..a77a2cd 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOFFTW_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOFFTW_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index bb0b517..b0d73fd 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/intl;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;includes\tcltk\include;includes\tcltk\include\X11"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;includes\tcltk\include;includes\tcltk\include\X11"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../../libs/intl;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;includes\tcltk\include;includes\tcltk\include\X11"
+                               AdditionalIncludeDirectories="includes;src/c;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../localization/includes;../../libs/intl;includes\tcltk\include;includes\tcltk\include\X11"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 72db628..a9f91ad 100644 (file)
@@ -20,7 +20,7 @@ void C2F(mputstr) (int *fd, char *str, double *res, int *ierr)
        }
        else 
        {
-               sprintf(fa,"%s",str);
+               fprintf(fa,"%s",str);
                (*res) = (*ierr) =ferror(fa);
        }
 }
index 4c0421c..1415e5f 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 7efe8b9..54449ba 100644 (file)
@@ -8,6 +8,7 @@
 #include "TerminateHistoryManager.h"
 #include "MALLOC.h"
 #include "Scierror.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_history_manager)()
 {
index 615d4ce..13ab7ed 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOHISTORY_MANAGER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOHISTORY_MANAGER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index ae7bd65..ce613e9 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/MALLOC/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 259d1c6..702ff62 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../src/c"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../src/c"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../src/c"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../src/c"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index ac4f62f..1b7ae0e 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../fileio/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\setenvc.h"
+                               RelativePath=".\setenvc.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\setenvc.h"
+                               RelativePath="..\..\includes\setenvc.h"
                                >
                        </File>
                        <File
index 81bfafc..8adb1a8 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../java/jdk/include;../../java/jdk/include/win32;includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="../../java/jdk/include;../../java/jdk/include/win32;includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../java/jdk/include;../../java/jdk/include/win32;includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="../../java/jdk/include;../../java/jdk/include/win32;includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/libxml2;../../libs/libxml2/libxml;../../libs/dynamiclibrary/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 2894d9e..f7c5953 100644 (file)
@@ -9,6 +9,7 @@
 #include "scilabmode.h"
 #include "Scierror.h"
 #include "callFunctionFromGateway.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/
 static gw_generic_table  Tab[]=
 {
index f071884..f64dc5f 100644 (file)
@@ -10,6 +10,7 @@
 #include "Scierror.h"
 #include "addToClasspath.h"
 #include "getClasspath.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_javaclasspath) _PARAMS((char *fname,unsigned long fname_len))
 {
index dcb57b8..255e93c 100644 (file)
@@ -10,6 +10,7 @@
 #include "Scierror.h"
 #include "addToLibrarypath.h"
 #include "getLibrarypath.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_javalibrarypath) _PARAMS((char *fname,unsigned long fname_len))
 {
index af509ba..22366c7 100644 (file)
@@ -10,6 +10,7 @@
 #include "stack-c.h"
 #include "system_getproperty.h"
 #include "Scierror.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_system_getproperty) _PARAMS((char *fname,unsigned long fname_len))
 {
index a1aee27..45a3874 100644 (file)
@@ -10,6 +10,7 @@
 #include "stack-c.h"
 #include "system_setproperty.h"
 #include "Scierror.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/
 int C2F(sci_system_setproperty) _PARAMS((char *fname,unsigned long fname_len))
 {
index 7537a0f..76269af 100644 (file)
@@ -13,6 +13,7 @@
 #include "JVM.h"
 #include "createMainScilabObject.h"
 #include "scilabDefaults.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 static void DoLoadClasspathInEtc(char *SCIPATH);
 static void DoLoadLibrarypathInEtc(char *SCIPATH);
index 2d53f37..c202da6 100644 (file)
@@ -10,6 +10,7 @@
 #include "MALLOC.h"
 #include "getScilabJavaVM.h"
 #include "fromjava.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 /* #define _JNI_DEBUG_TRACE */
 /*-----------------------------------------------------------------------------------*/ 
index 7e5b229..27b13ee 100644 (file)
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include "JVM_commons.h"
 #include "dynamiclibrary.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 static DynLibHandle hLibJVM = NULL;
 /*-----------------------------------------------------------------------------------*/ 
index 3c91ce7..f35d3f7 100644 (file)
@@ -7,6 +7,7 @@
 #include "getScilabJNIEnv.h"
 #include "../../fileio/includes/isdir.h"
 #include "fromjava.h"
+#
 /*-----------------------------------------------------------------------------------*/ 
 BOOL addToLibrarypath(char *librarypathstring)
 {
@@ -35,7 +36,7 @@ BOOL addToLibrarypath(char *librarypathstring)
                                if (cls)
                                {
                                        jmethodID mid=NULL;
-                                       mid = (*currentENV)->GetStaticMethodID(currentENV, cls, _("addPath"),"(Ljava/lang/String;)V");
+                                       mid = (*currentENV)->GetStaticMethodID(currentENV, cls,"addPath","(Ljava/lang/String;)V");
                                        if (mid)
                                        {
                                                jstring jstr;
index ba04ba5..7d66b9a 100644 (file)
@@ -8,6 +8,7 @@
 #include "getScilabJavaVM.h"
 #include "catchIfJavaException.h"
 #include "scilabmode.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 static jobject ScilabObject;
 /*-----------------------------------------------------------------------------------*/ 
index f75183a..5c2117f 100644 (file)
@@ -10,6 +10,7 @@
 #include "addToClasspath.h"
 #include "setgetSCIpath.h"
 #include "MALLOC.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 BOOL LoadClasspath(char *xmlfilename)
 {
index 8849bbb..436a271 100644 (file)
@@ -10,6 +10,7 @@
 #include "addToLibrarypath.h"
 #include "setgetSCIpath.h"
 #include "MALLOC.h"
+#include "localization.h"
 /*-----------------------------------------------------------------------------------*/ 
 BOOL LoadLibrarypath(char *xmlfilename)
 {
index 8098910..b86de98 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../core/src/c"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../core/src/c;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/intl;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../core/src/c"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../core/src/c;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index ff7ba4a..fc930a1 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="8.00"
        Name="metanet"
        ProjectGUID="{E9741474-5C3A-4101-8B85-AC5221018C05}"
        RootNamespace="metanet"
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index ece16fb..9bb0230 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../../core/includes;../../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../../core/includes;../../../../output_stream/includes;../../../../localization/includes;../../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 333a829..438f234 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="8.00"
        Name="libmat"
        ProjectGUID="{8A508625-C2AA-4295-AA76-16E4E456D13D}"
        Keyword="Win32Proj"
@@ -39,7 +39,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="STRICT;mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="STRICT;mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="1"
index b2e29c8..feea0ca 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="8.00"
        Name="libmex"
        ProjectGUID="{0AEC8745-BB5B-4E66-A59A-7251412C3605}"
        RootNamespace="libmex"
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="STRICT;mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="STRICT;mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="1"
index 1ab44f0..f18cdd5 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="8.00"
        Name="libmx"
        ProjectGUID="{CEF88C5F-6820-46D4-BCCD-44D5581481C5}"
        RootNamespace="libmx"
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="STRICT;mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                        />
                        <Tool
                                Name="VCCLCompilerTool"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="STRICT;mexFunction=mex_libmx;mexfunction_=mexlibmx_;FORDLL;_CRT_SECURE_NO_DEPRECATE"
                                RuntimeLibrary="2"
                                EnableEnhancedInstructionSet="1"
index c43dc98..1bc44ec 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 05c58d2..f4c6524 100644 (file)
@@ -11,7 +11,6 @@
 #include "machine.h"
 #include "stack-c.h"
 #include "version.h"
-#include "localization.h"
 
 #if defined (__STDC__) || defined (_MSC_VER)
        int  Scierror __PARAMS((int iv,char *fmt,...));
index 7f900c4..b4bc544 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"\r
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"\r
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
index 0b0a4f5..6c6c66d 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOPVM_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOPVM_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index aa080ed..7429a7b 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../../libs/hashtable"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index c3a713d..45e3986 100644 (file)
@@ -3,8 +3,8 @@
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
 #include "machine.h" 
-/*-----------------------------------------------------------------------------------*/ 
-extern int  Scierror __PARAMS((int iv,char *fmt,...));
+#include "localization.h"
+#include "Scierror.h"
 /*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_randlib)()
 {
index 6710fd3..e966d40 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NORANDLIB_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NORANDLIB_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 394f938..ef3c68f 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/intl;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;../jvm/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/intl;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni"
+                               AdditionalIncludeDirectories="includes;../jvm/includes;../localization/includes;../graphics/includes;../graphics/includes/handleDrawing;src/cpp;../../libs/doublylinkedlist/includes;../../libs/MALLOC/includes;../core/includes;../output_stream/includes;../../java/jdk/include;../../java/jdk/include/win32;src/jni;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;RENDERER_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 0b07049..e8d5053 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../console/includes/;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../console/includes/;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/MALLOC/includes;../../../localization/includes;../../../../libs/intl;../../../console/includes/;../../../core/includes;../../../output_stream/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../history_manager/includes/;../../../action_binding/includes"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 47b9264..24e53f9 100644 (file)
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include "command.h"
 #include "sciprint.h"
+#include "localization.h"
 #include "win_mem_alloc.h" /* MALLOC */
 #include "prompt.h"
 #include "../../core/src/c/flags.h"
index 044fc79..a52d8e3 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"
index d48cbe7..7a802b2 100644 (file)
@@ -3,8 +3,8 @@
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
 #include "machine.h" 
-/*-----------------------------------------------------------------------------------*/ 
-extern int  Scierror __PARAMS((int iv,char *fmt,...));
+#include "localization.h"
+#include "Scierror.h"
 /*-----------------------------------------------------------------------------------*/ 
 int C2F(gw_sound)()
 {
index 4afe482..107adcf 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOSOUND_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOSOUND_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 395b342..a7d6ac7 100644 (file)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
        ProjectType="Visual C++"
-       Version="8,00"
+       Version="8.00"
        Name="sparse"
        ProjectGUID="{51240B08-5E4E-439B-B745-C870D5B513BF}"
        >
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../output_stream/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../output_stream/includes;../../../localization/includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index a0fa530..27ed442 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
                        Filter="h;hpp;hxx;hm;inl"
                        >
                        <File
-                               RelativePath="..\..\includes\gw_special_functions1.h"
+                               RelativePath="..\..\sci_gateway\c\gw_special_functions1.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\sci_gateway\c\gw_special_functions1.h"
+                               RelativePath="..\..\includes\gw_special_functions1.h"
                                >
                        </File>
                        <File
index a8d1e47..69f77d0 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl"\r
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"\r
                                PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl"\r
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"\r
                                PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
index 67327bd..b2dec2c 100644 (file)
@@ -4,6 +4,7 @@
 /*-----------------------------------------------------------------------------------*/ \r
 #include "machine.h" \r
 #include "Scierror.h"\r
+#include "localization.h"\r
 /*-----------------------------------------------------------------------------------*/ \r
 int C2F(gw_spreadsheet)()\r
 {\r
index be1a967..081eedd 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"\r
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOSPREADSHEET_EXPORTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="0"\r
                                InlineFunctionExpansion="1"\r
                                FavorSizeOrSpeed="1"\r
                                WholeProgramOptimization="false"\r
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"\r
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"\r
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOSPREADSHEET_EXPORTS"\r
                                StringPooling="true"\r
                                RuntimeLibrary="2"\r
index eb004f9..5b58182 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../src/c;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../src/c;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../src/c;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../output_stream/includes;../../../../libs/MALLOC/includes;../../src/c;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 4c70e0f..10ef593 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../../core/includes;../../../output_stream/includes;../../../../libs/hashtable"
+                               AdditionalIncludeDirectories="../../includes;../../../../libs/MALLOC/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/hashtable;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SCICOS_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index b71eae5..0069ce1 100644 (file)
@@ -11,7 +11,7 @@
 #include "tcl.h"
 #include "tk.h"
 #include "MALLOC.h"
-//#include "../../localization/includes/QueryStringError.h"
+#include "../../localization/includes/localization.h"
 #include "../../fileio/includes/ConvertPathUnixToWindows.h"
 /*-----------------------------------------------------------------------------------*/
 BOOL Set_TCL_LIBRARY_PATH(char *DefaultPath)
@@ -37,12 +37,8 @@ BOOL Set_TCL_LIBRARY_PATH(char *DefaultPath)
        /* c:\progra~1\scilab-5.0\modules\tclsci\tcl\tcl8.4 */
        if (GetShortPathName(DefaultPath,ShortPath,PATH_MAX)==0)
        {
-               //char *msg1=QueryStringError(_("Incorrect TCL_LIBRARY environment variable"));
-               //char *msg2=QueryStringError(_("TCL_LIBRARY has been redefined to "));
                fprintf(stderr,"\n%s\n%s%s.\n",_("Incorrect TCL_LIBRARY environment variable"),_("TCL_LIBRARY has been redefined to "),DefaultPath);
                if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
-//             if (msg1) {FREE(msg1);msg1=NULL;}
-//             if (msg2) {FREE(msg2);msg2=NULL;}
 
                ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
                wsprintf (env, "TCL_LIBRARY=%s\\modules\\tclsci\\tcl\\tcl%d.%d",CopyOfDefaultPath,major,minor);
@@ -89,12 +85,8 @@ BOOL Set_TK_LIBRARY_PATH(char *DefaultPath)
        /* c:\progra~1\scilab-3.1\modules\tclsci\tcl\tk8.4 */
        if (GetShortPathName(DefaultPath,ShortPath,PATH_MAX)==0)
        {
-               //char *msg1=QueryStringError(_("Incorrect TK_LIBRARY environment variable"));
-               //char *msg2=QueryStringError(_("TK_LIBRARY has been redefined to "));
                fprintf(stderr,"\n%s\n%s%s.\n",_("Incorrect TK_LIBRARY environment variable"),_("TK_LIBRARY has been redefined to "),DefaultPath);
                if (CopyOfDefaultPath) {FREE(CopyOfDefaultPath);CopyOfDefaultPath=NULL;}
-               //if (msg1){FREE(msg1);msg1=NULL;}
-               //if (msg2){FREE(msg2);msg2=NULL;}
 
                ConvertPathUnixToWindowsFormat(ShortPath,CopyOfDefaultPath);
                wsprintf (env, "TK_LIBRARY=%s\\modules\\tclsci\\tcl\\tk%d.%d",CopyOfDefaultPath,major,minor);
index 59ac9d1..e6e6b01 100644 (file)
@@ -3,13 +3,13 @@
 /* Allan CORNET */
 /*-----------------------------------------------------------------------------------*/ 
 #include "machine.h" 
+#include "localization.h"
+#include "Scierror.h"
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef _MSC_VER
   int XTKsocket=0;
 #endif
 /*-----------------------------------------------------------------------------------*/ 
-extern int  Scierror __PARAMS((int iv,char *fmt,...));
-/*-----------------------------------------------------------------------------------*/ 
 BOOL withtk(void)
 { 
        return FALSE;
index 064dec8..a90d236 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../../libs/intl"
+                               AdditionalIncludeDirectories="../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;NOTCLSCI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index a594610..105e634 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;includes;src/c;../../libs/MALLOC/includes;../core/includes;includes\tcltk\include;includes\tcltk\include\X11;../action_binding/includes;../output_stream/includes;../../libs/intl"
+                               AdditionalIncludeDirectories=".;includes;src/c;../../libs/MALLOC/includes;../core/includes;includes\tcltk\include;includes\tcltk\include\X11;../action_binding/includes;../output_stream/includes;../localization/includes;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;TCLSCI_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;includes;src/c;../../libs/MALLOC/includes;../core/includes;includes\tcltk\include;includes\tcltk\include\X11;../action_binding/includes;../output_stream/includes;../../libs/intl"
+                               AdditionalIncludeDirectories=".;includes;src/c;../../libs/MALLOC/includes;../core/includes;includes\tcltk\include;includes\tcltk\include\X11;../action_binding/includes;../output_stream/includes;../localization/includes;../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WITH_TK;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;TCLSCI_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
index 57aeb90..04f48e5 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../../libs/MALLOC/includes;../../libs/intl"
+                               AdditionalIncludeDirectories="includes;src/c;../core/includes;../output_stream/includes;../localization/includes;../../libs/MALLOC/includes;../../libs/intl"
                                PreprocessorDefinitions="FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;SOUND_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="2"