add dependencies on intl.dll
Allan Cornet [Mon, 22 Oct 2007 13:31:08 +0000 (13:31 +0000)]
23 files changed:
scilab/libs/LibScilab/DllmainLibscilab.c
scilab/modules/boolean/src/c/boolean.vcproj
scilab/modules/cacsd/src/c/cacsd.vcproj
scilab/modules/console/src/c/DllmainConsole.c [new file with mode: 0644]
scilab/modules/console/src/c/console.vcproj
scilab/modules/core/includes/machine.h.vc
scilab/modules/core/src/c/core.vcproj
scilab/modules/data_structures/src/c/data_structures.vcproj
scilab/modules/differential_equations/src/c/differential_equations.vcproj
scilab/modules/double/src/c/double.vcproj
scilab/modules/elementaries_functions/src/c/elementaries_functions.vcproj
scilab/modules/helptools/macros/xmlfiletohtml.sci
scilab/modules/integer/src/c/integer.vcproj
scilab/modules/interpolation/src/c/interpolation.vcproj
scilab/modules/localization/src/c/InitializeLocalization.c
scilab/modules/localization/src/io_Import.def [new file with mode: 0644]
scilab/modules/localization/src/localization.vcproj
scilab/modules/optimization/src/c/optim.vcproj
scilab/modules/polynomials/src/c/polynomials.vcproj
scilab/modules/signal_processing/src/c/signal.vcproj
scilab/modules/sparse/src/c/sparse.vcproj
scilab/modules/special_functions/src/c/special_functions.vcproj
scilab/modules/statistics/src/c/statistics.vcproj

index 3dc928e..6140581 100644 (file)
@@ -31,6 +31,7 @@
 #pragma comment(lib,"../../bin/lapack.lib")
 #pragma comment(lib,"../../bin/linear_algebra_f.lib")
 #pragma comment(lib,"../../bin/libxml2.lib")
+#pragma comment(lib,"../../bin/intl.lib")
 /*-----------------------------------------------------------------------------------*/ 
 #ifndef USE_F2C
 #pragma comment(lib,"../../bin/sparse_f.lib")
index b2240de..04c04d5 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 90f84f4..9a40fb3 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
diff --git a/scilab/modules/console/src/c/DllmainConsole.c b/scilab/modules/console/src/c/DllmainConsole.c
new file mode 100644 (file)
index 0000000..2a28e77
--- /dev/null
@@ -0,0 +1,25 @@
+/*-----------------------------------------------------------------------------------*/\r
+/* INRIA 2006 */\r
+/* Allan CORNET */\r
+/*-----------------------------------------------------------------------------------*/ \r
+#include <windows.h> \r
+/*-----------------------------------------------------------------------------------*/ \r
+#pragma comment(lib,"../../../../bin/intl.lib")\r
+/*-----------------------------------------------------------------------------------*/ \r
+int WINAPI DllMain (HINSTANCE hInstance , DWORD reason, PVOID pvReserved)\r
+{\r
+  switch (reason) \r
+    {\r
+    case DLL_PROCESS_ATTACH:\r
+      break;\r
+    case DLL_PROCESS_DETACH:\r
+      break;\r
+    case DLL_THREAD_ATTACH:\r
+      break;\r
+    case DLL_THREAD_DETACH:\r
+      break;\r
+    }\r
+  return 1;\r
+}\r
+/*-----------------------------------------------------------------------------------*/ \r
+\r
index bf5faf4..4f39735 100644 (file)
@@ -46,7 +46,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="0"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
                                WholeProgramOptimization="false"
-                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32"
+                               AdditionalIncludeDirectories=".;../../includes;../jni;../../../../libs/MALLOC/includes;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl"
                                PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;FORDLL;WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS"
                                StringPooling="true"
                                RuntimeLibrary="2"
                                >
                        </File>
                        <File
+                               RelativePath=".\DllmainConsole.c"
+                               >
+                       </File>
+                       <File
                                RelativePath=".\dropFiles.c"
                                >
                        </File>
index a605271..40bb703 100644 (file)
@@ -102,6 +102,8 @@ typedef int BOOL ;
 /* PATH_MAX : Under Windows : 1024 */
 #define PATH_MAX 1024
 
+#define HAVE_LIBINTL_H
+
 #ifdef HAVE_LIBINTL_H
 /* Have been able to find the libintl.h file on the system */
 #include <libintl.h>
index edee06e..5024060 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;../../../../libs/libxml2;../../../../libs/libxml2/libxml"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../../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;../../../../libs/libxml2;../../../../libs/libxml2/libxml"
+                               AdditionalIncludeDirectories=".;../../includes;../../../../libs/dynamiclibrary/includes;../../../../libs/doublylinkedlist/includes;../../../../libs/MALLOC/includes;../../../mexlib/includes;../../../gui/src/c/wsci;../../../../libs/libxml2;../../../../libs/libxml2/libxml;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE;WITH_TK;WITH_ATLAS;__STDC__"
                                StringPooling="true"
                                RuntimeLibrary="0"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\fromjava.h"
+                               RelativePath=".\fromjava.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\fromjava.h"
+                               RelativePath="..\..\includes\fromjava.h"
                                >
                        </File>
                        <File
index 3e79176..0c06b0e 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 74e7c4e..d649e6d 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 8b73868..4ba34e3 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index d368a4b..d181998 100644 (file)
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories=".;../../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;../../../core/includes;../../../../libs/MALLOC/includes"
+                               AdditionalIncludeDirectories=".;../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index b426a92..864ef05 100644 (file)
@@ -18,7 +18,7 @@ function ok = xmlfiletohtml(path,xsl,directory_language,default_language)
        if MSDOS then
          generate_cmd='sabcmd';
        else
-         generate_cmd='sabcmd';
+         generate_cmd='xsltproc';
        end
        
        [lhs,rhs] = argn(0);
index 28c75d2..9596487 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/intl;../../../../libs/MALLOC/includes"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 9b2cea0..9d922c2 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../src/c;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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;../../../../libs/MALLOC/includes;../../src/c;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl;../../src/c"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index f145ff0..277e84c 100644 (file)
@@ -12,9 +12,7 @@
 #include "machine.h"
 #include "scilabDefaults.h"
 #include "setgetlanguage.h"
-#ifdef _MSC_VER
-#define _putenv putenv
-#endif
+#include "../../../io/includes/setenvc.h"
 /*-----------------------------------------------------------------------------------*/ 
 
 /**
  */
 static void putEnvLC_ALL(char *locale){
 
-       char *localeDeclared=NULL;      
-
-       localeDeclared=(char*)MALLOC(sizeof(char)*(strlen(EXPORTENVLOCALE)+ strlen("=")+ strlen(locale)+1));
-       strcat(localeDeclared,EXPORTENVLOCALE);
-       strcat(localeDeclared,"=");
-       strcat(localeDeclared,locale);
        /* It will put in the env something like LC_ALL=fr_FR */
-
-       if (putenv (localeDeclared)){
+       if ( !setenvc(EXPORTENVLOCALE,locale))
+       {
                fprintf(stderr,"Failed to declare the system variable LC_ALL\n");
        }
-       FREE(localeDeclared);
 }
 
 
diff --git a/scilab/modules/localization/src/io_Import.def b/scilab/modules/localization/src/io_Import.def
new file mode 100644 (file)
index 0000000..4100a2a
--- /dev/null
@@ -0,0 +1,10 @@
+LIBRARY    io.dll\r
+\r
+\r
+EXPORTS\r
+ setenvc\r
\r
\r
\r
\r
\ No newline at end of file
index a20643b..85b8952 100644 (file)
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n localization.dll %%f &gt;nul&#x0D;&#x0A;copy *.def localizationtmp.def &gt;nul&#x0D;&#x0A;copy ..\localization_header.def+localizationtmp.def  ..\localization.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n localization.dll %%f &gt;nul&#x0D;&#x0A;copy *.def localizationtmp.def &gt;nul&#x0D;&#x0A;copy ..\localization_header.def+localizationtmp.def  ..\localization.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
                                AdditionalOptions="/fixed:no"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib io.lib"
                                OutputFile="..\..\..\bin\scilocalization.dll"
                                LinkIncremental="1"
                                ModuleDefinitionFile="localization.def"
                        />
                        <Tool
                                Name="VCPreLinkEventTool"
-                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n localization.dll %%f &gt;nul&#x0D;&#x0A;copy *.def localizationtmp.def &gt;nul&#x0D;&#x0A;copy ..\localization_header.def+localizationtmp.def  ..\localization.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
+                               CommandLine="lib /DEF:&quot;$(InputDir)LibScilab_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)LibScilab.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;lib /DEF:&quot;$(InputDir)io_Import.def&quot; /SUBSYSTEM:WINDOWS /MACHINE:X86 /OUT:&quot;$(InputDir)io.lib&quot; 1&gt;NUL 2&gt;NUL&#x0D;&#x0A;cd $(IntDir) &gt;nul&#x0D;&#x0A;for %%f in (*.obj) do  ..\..\..\..\bin\dumpexts -o %%~nf.def -n localization.dll %%f &gt;nul&#x0D;&#x0A;copy *.def localizationtmp.def &gt;nul&#x0D;&#x0A;copy ..\localization_header.def+localizationtmp.def  ..\localization.def &gt;nul&#x0D;&#x0A;del *.def &gt;nul&#x0D;&#x0A;cd .. &gt;nul&#x0D;&#x0A;"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="Libscilab.lib"
+                               AdditionalDependencies="Libscilab.lib io.lib"
                                OutputFile="..\..\..\bin\scilocalization.dll"
                                ModuleDefinitionFile="localization.def"
                                OptimizeForWindows98="1"
index 3f67d13..1465ce7 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 2493d39..f46c68d 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 0b37772..737b09a 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index f3e8dd5..952b559 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"
index 03ed614..3591a40 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../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;../../../core/includes;../../../../libs/MALLOC/includes;"
+                               AdditionalIncludeDirectories="../../includes;../../../core/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="..\..\sci_gateway\c\gw_special_functions1.h"
+                               RelativePath="..\..\includes\gw_special_functions1.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\includes\gw_special_functions1.h"
+                               RelativePath="..\..\sci_gateway\c\gw_special_functions1.h"
                                >
                        </File>
                        <File
index ed135cb..d326dc6 100644 (file)
@@ -40,7 +40,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../src/c"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../src/c;../../../../libs/intl"
                                PreprocessorDefinitions="_LIB;STRICT;_DEBUG;_CRT_SECURE_NO_DEPRECATE"
                                BasicRuntimeChecks="0"
                                RuntimeLibrary="1"
                                Optimization="2"
                                InlineFunctionExpansion="1"
                                FavorSizeOrSpeed="1"
-                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../src/c"
+                               AdditionalIncludeDirectories="../../includes;../../../core/includes;../../../../libs/MALLOC/includes;../../src/c;../../../../libs/intl"
                                PreprocessorDefinitions="NDEBUG;_LIB;STRICT;_CRT_SECURE_NO_DEPRECATE"
                                StringPooling="true"
                                RuntimeLibrary="0"