Refactorize NotExp evaluation 71/14671/2
Calixte DENIZET [Fri, 13 Jun 2014 13:58:18 +0000 (15:58 +0200)]
Change-Id: Ia0abc1b3e288048e0af6290bb5b38015c149a914

91 files changed:
scilab/modules/action_binding/Makefile.am
scilab/modules/action_binding/Makefile.in
scilab/modules/action_binding/sci_gateway/cpp/action_binding_gw.vcxproj
scilab/modules/action_binding/sci_gateway/cpp/sci_notify.cpp
scilab/modules/ast/includes/runvisitor.hxx
scilab/modules/ast/src/cpp/runvisitor.cpp
scilab/modules/completion/Makefile.am
scilab/modules/completion/Makefile.in
scilab/modules/completion/src/c/completion.vcxproj
scilab/modules/completion/src/cpp/getfieldsdictionary.cpp
scilab/modules/console/Makefile.am
scilab/modules/console/Makefile.in
scilab/modules/console/sci_gateway/cpp/console_gw.vcxproj
scilab/modules/console/src/c/console.vcxproj
scilab/modules/console/src/noconsole/noconsole.vcxproj
scilab/modules/data_structures/Makefile.am
scilab/modules/data_structures/Makefile.in
scilab/modules/data_structures/src/c/data_structures.vcxproj
scilab/modules/dynamic_link/Makefile.am
scilab/modules/dynamic_link/Makefile.in
scilab/modules/dynamic_link/sci_gateway/cpp/dynamic_link_gw.vcxproj
scilab/modules/dynamic_link/src/c/dynamic_link.vcxproj
scilab/modules/fileio/fileio.vcxproj
scilab/modules/graphics/graphics.vcxproj
scilab/modules/graphics/graphics.vcxproj.filters
scilab/modules/graphics/src/nographics/nographics.vcxproj
scilab/modules/gui/Makefile.am
scilab/modules/gui/Makefile.in
scilab/modules/gui/sci_gateway/cpp/gui_gw.vcxproj
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_h5close.cpp
scilab/modules/hdf5/src/c/hdf5.vcxproj
scilab/modules/helptools/Makefile.am
scilab/modules/helptools/Makefile.in
scilab/modules/history_manager/Makefile.am
scilab/modules/history_manager/Makefile.in
scilab/modules/history_manager/sci_gateway/cpp/history_manager_gw.vcxproj
scilab/modules/interpolation/Makefile.am
scilab/modules/interpolation/Makefile.in
scilab/modules/interpolation/src/c/interpolation.vcxproj
scilab/modules/io/Makefile.am
scilab/modules/io/Makefile.in
scilab/modules/io/src/cpp/io_gw.vcxproj
scilab/modules/jvm/Makefile.am
scilab/modules/jvm/Makefile.in
scilab/modules/jvm/sci_gateway/cpp/libjvm_gw.vcxproj
scilab/modules/localization/Makefile.am
scilab/modules/localization/Makefile.in
scilab/modules/localization/sci_gateway/cpp/localization_gw.vcxproj
scilab/modules/output_stream/src/c/output_stream.vcxproj
scilab/modules/parse/Makefile.am
scilab/modules/parse/Makefile.in
scilab/modules/parse/parse.vcxproj
scilab/modules/randlib/Makefile.am
scilab/modules/randlib/Makefile.in
scilab/modules/randlib/src/c/randlib.vcxproj
scilab/modules/signal_processing/Makefile.am
scilab/modules/signal_processing/Makefile.in
scilab/modules/signal_processing/sci_gateway/cpp/signal_processing_gw.vcxproj
scilab/modules/spreadsheet/Makefile.am
scilab/modules/spreadsheet/Makefile.in
scilab/modules/spreadsheet/spreadsheet.vcxproj
scilab/modules/string/src/c/string.vcxproj
scilab/modules/symbol/Makefile.am
scilab/modules/symbol/Makefile.in
scilab/modules/symbol/symbol.vcxproj
scilab/modules/system_env/Makefile.am
scilab/modules/system_env/Makefile.in
scilab/modules/system_env/system_env.vcxproj
scilab/modules/time/Makefile.am
scilab/modules/time/Makefile.in
scilab/modules/time/sci_gateway/cpp/time_gw.vcxproj
scilab/modules/types/includes/arrayof.hxx
scilab/modules/types/includes/bool.hxx
scilab/modules/types/includes/cell.hxx
scilab/modules/types/includes/double.hxx
scilab/modules/types/includes/graphichandle.hxx
scilab/modules/types/includes/int.hxx
scilab/modules/types/includes/internal.hxx
scilab/modules/types/includes/sparse.hxx
scilab/modules/types/includes/string.hxx
scilab/modules/types/includes/struct.hxx
scilab/modules/types/includes/type_traits.hxx
scilab/modules/types/src/cpp/arrayof.cpp
scilab/modules/types/typesmacro/typesmacro.vcxproj
scilab/modules/windows_tools/src/c/windows_tools.vcxproj
scilab/modules/xml/Makefile.am
scilab/modules/xml/Makefile.in
scilab/modules/xml/src/cpp/XMLMlistsManagement.cpp
scilab/modules/xml/xml.vcxproj

index b9b7b13..315c27c 100644 (file)
@@ -42,15 +42,16 @@ endif
 
 libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.cpp
 libsciaction_binding_disable_la_CPPFLAGS =     -I$(srcdir)/includes/ \
-                                                                                       -I$(top_srcdir)/modules/localization/includes/ \
-                                                                                       -I$(top_srcdir)/modules/output_stream/includes \
-                                                                                       -I$(top_srcdir)/modules/ast/includes \
-                                               -I$(top_srcdir)/modules/ast/includes/exps \
-                                                                                       -I$(top_srcdir)/modules/symbol/includes \
-                                                                                       -I$(top_srcdir)/modules/system_env/includes \
-                                                                                       -I$(top_srcdir)/modules/types/includes \
-                                                                                       -I$(top_srcdir)/libs/dynamiclibrary/includes \
-                                                                                       $(AM_CPPFLAGS)
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/ast/includes \
+       -I$(top_srcdir)/modules/ast/includes/exps \
+       -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/libs/dynamiclibrary/includes \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 # Includes need for the compilation
 libsciaction_binding_la_CPPFLAGS = \
@@ -70,6 +71,7 @@ $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/system_env/includes \
 -I$(top_srcdir)/modules/types/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
index 3995be3..afc4a34 100644 (file)
@@ -594,15 +594,16 @@ GIWS_WRAPPERS = src/jni/Signal.giws.xml
 BUILT_SOURCES = $(am__append_1) $(am__append_2)
 libsciaction_binding_disable_la_SOURCES = src/noaction_binding/noaction_binding.cpp
 libsciaction_binding_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
-                                                                                       -I$(top_srcdir)/modules/localization/includes/ \
-                                                                                       -I$(top_srcdir)/modules/output_stream/includes \
-                                                                                       -I$(top_srcdir)/modules/ast/includes \
-                                               -I$(top_srcdir)/modules/ast/includes/exps \
-                                                                                       -I$(top_srcdir)/modules/symbol/includes \
-                                                                                       -I$(top_srcdir)/modules/system_env/includes \
-                                                                                       -I$(top_srcdir)/modules/types/includes \
-                                                                                       -I$(top_srcdir)/libs/dynamiclibrary/includes \
-                                                                                       $(AM_CPPFLAGS)
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes \
+       -I$(top_srcdir)/modules/ast/includes \
+       -I$(top_srcdir)/modules/ast/includes/exps \
+       -I$(top_srcdir)/modules/symbol/includes \
+       -I$(top_srcdir)/modules/system_env/includes \
+       -I$(top_srcdir)/modules/types/includes \
+       -I$(top_srcdir)/libs/dynamiclibrary/includes \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 
 # Includes need for the compilation
@@ -623,6 +624,7 @@ $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/system_env/includes \
 -I$(top_srcdir)/modules/types/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 
index 1632866..a278c6e 100644 (file)
@@ -85,7 +85,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../src/c;../../src/jni;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../types/includes;../../../operations/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../output_stream/includes;../../../jvm/includes;../../../../libs/intl;../../../symbol/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;ACTION_BINDING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 4700b3e..f52f180 100644 (file)
 *
 */
 /*--------------------------------------------------------------------------*/
+
+#include "function.hxx"
+#include "action_binding_gw.hxx"
+#include "string.hxx"
+#include "Signal.hxx"
+
 extern "C"
 {
 #include "getScilabJavaVM.h"
@@ -19,11 +25,6 @@ extern "C"
 #include "Scierror.h"
 }
 
-#include "function.hxx"
-#include "action_binding_gw.hxx"
-#include "string.hxx"
-#include "Signal.hxx"
-
 /*--------------------------------------------------------------------------*/
 types::Function::ReturnValue sci_notify(types::typed_list &in, int _iRetCount, types::typed_list &out)
 {
index e8f3275..920f7b9 100644 (file)
@@ -389,20 +389,6 @@ public :
         }
     }
 
-    template <class intT, typename Y>
-    InternalType* notInt(intT* _pInt)
-    {
-        intT* pOut = new intT(_pInt->getRows(), _pInt->getCols());
-        Y* pDataIn = _pInt->get();
-        Y* pDataOut = pOut->get();
-        for (int i = 0 ; i < _pInt->getSize() ; i++)
-        {
-            pDataOut[i] = ~pDataIn[i];
-        }
-
-        return pOut;
-    }
-
     void visitprivate(const VarDec  &e)
     {
         try
index 96738d5..1401e8f 100644 (file)
@@ -916,102 +916,51 @@ void RunVisitorT<T>::visitprivate(const NotExp &e)
     */
     e.exp_get().accept(*this);
 
-    if (result_get()->isDouble())
+    InternalType * pValue = result_get();
+    InternalType * pReturn = NULL;
+    if (pValue->neg(pReturn))
     {
-        InternalType* pVar  = result_get();
-        Double *pdbl        = pVar->getAs<Double>();
-        Bool *pReturn       = new Bool(pdbl->getDims(), pdbl->getDimsArray());
-        double *pR                 = pdbl->getReal();
-        int *piB            = pReturn->get();
-        for (int i = 0 ; i < pdbl->getSize() ; i++)
+        if (pValue->isDeletable())
         {
-            piB[i] = pR[i] == 0 ? 1 : 0;
-        }
-
-        if (result_get()->isDeletable())
-        {
-            delete result_get();
+            delete pValue;
         }
 
         result_set(pReturn);
     }
-    else if (result_get()->isBool())
+    else
     {
-        InternalType* pIT   = result_get();
-        Bool *pb            = pIT->getAs<types::Bool>();
-        Bool *pReturn       = new Bool(pb->getDims(), pb->getDimsArray());
-        int *piR            = pb->get();
-        int *piB            = pReturn->get();
+        // neg returned false so the negation is not possible so we call the overload (%foo_5)
+        types::typed_list in;
+        types::typed_list out;
 
-        for (int i = 0 ; i < pb->getSize() ; i++)
-        {
-            piB[i] = piR[i] == 1 ? 0 : 1;
-        }
+        pValue->IncreaseRef();
+        in.push_back(pValue);
 
-        if (result_get()->isDeletable())
+        Callable::ReturnValue Ret = Overload::call(L"%" + result_get()->getShortTypeStr() + L"_5", in, 1, out, this);
+        if (Ret != Callable::OK)
         {
-            delete result_get();
+            throw ScilabError();
         }
 
-        result_set(pReturn);
-    }
-    else if (result_get()->isSparseBool())
-    {
-        InternalType* pIT   = result_get();
-        SparseBool *pb            = pIT->getAs<types::SparseBool>();
-        SparseBool *pReturn       = new SparseBool(pb->getRows(), pb->getCols());
-
-        for (int iRows = 0 ; iRows < pb->getRows() ; iRows++)
+        if (out.size() == 0)
         {
-            for (int iCols = 0 ; iCols < pb->getCols() ; iCols++)
-            {
-                pReturn->set(iRows, iCols, !pb->get(iRows, iCols));
-            }
+            result_set(NULL);
         }
-
-
-        result_set(pReturn);
-    }
-    else if (result_get()->isInt())
-    {
-        InternalType* pReturn = NULL;
-        InternalType* pIT = result_get();
-        switch (result_get()->getType())
+        else if (out.size() == 1)
         {
-            case InternalType::ScilabInt8 :
-                pReturn = notInt< Int8, char >(pIT->getAs<Int8>());
-                break;
-            case InternalType::ScilabUInt8 :
-                pReturn = notInt<UInt8, unsigned char>(pIT->getAs<UInt8>());
-                break;
-            case InternalType::ScilabInt16 :
-                pReturn = notInt< Int16, short >(pIT->getAs<Int16>());
-                break;
-            case InternalType::ScilabUInt16 :
-                pReturn = notInt<UInt16, unsigned short>(pIT->getAs<UInt16>());
-                break;
-            case InternalType::ScilabInt32 :
-                pReturn = notInt<Int32, int>(pIT->getAs<Int32>());
-                break;
-            case InternalType::ScilabUInt32 :
-                pReturn = notInt<UInt32, unsigned int>(pIT->getAs<UInt32>());
-                break;
-            case InternalType::ScilabInt64 :
-                pReturn = notInt<Int64, long long>(pIT->getAs<Int64>());
-                break;
-            case InternalType::ScilabUInt64 :
-                pReturn = notInt<UInt64, unsigned long long>(pIT->getAs<UInt64>());
-                break;
-            default :
-                break;
+            out[0]->DecreaseRef();
+            result_set(out[0]);
         }
-
-        if (result_get()->isDeletable())
+        else
         {
-            delete result_get();
+            for (int i = 0 ; i < static_cast<int>(out.size()) ; i++)
+            {
+                out[i]->DecreaseRef();
+                result_set(i, out[i]);
+            }
         }
 
-        result_set(pReturn);
+        pValue->DecreaseRef();
     }
 }
 
index 9a996ac..6ea1568 100644 (file)
@@ -68,6 +68,7 @@ libscicompletion_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/dynamic_link/includes \
     -I$(top_srcdir)/modules/external_objects/includes \
     $(JAVA_JNI_INCLUDE) \
+    $(EIGEN_CPPFLAGS) \
     $(XML_FLAGS) \
     $(AM_CPPFLAGS)
 
index 75653c7..f6f11b7 100644 (file)
@@ -655,6 +655,7 @@ libscicompletion_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/dynamic_link/includes \
     -I$(top_srcdir)/modules/external_objects/includes \
     $(JAVA_JNI_INCLUDE) \
+    $(EIGEN_CPPFLAGS) \
     $(XML_FLAGS) \
     $(AM_CPPFLAGS)
 
index 1ab0cb0..485d183 100644 (file)
@@ -84,7 +84,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/libxml2;../../../../libs/intl;../../../string/includes;../../../ast/includes;../../../types/includes;../../../xml/includes;../../../xml/src/cpp;../../../api_scilab/includes;../../../core/includes;../../../operations/includes;../../../dynamic_link/includes;../../../localization/includes;../../../output_stream/includes;../../../fileio/includes;../../../graphics/includes;../../../symbol/includes;../../../external_objects/includes;../../../external_objects/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;COMPLETION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index b71f553..6a9c02d 100644 (file)
 *
 */
 
+#include "context.hxx"
+#include "struct.hxx"
+#include "tlist.hxx"
+
 extern "C"
 {
 #include <string.h> /* strcmp */
@@ -25,10 +29,6 @@ extern "C"
 #include "getfields.h"
 }
 
-#include "context.hxx"
-#include "struct.hxx"
-#include "tlist.hxx"
-
 static int isInitialized = 0;
 
 /*--------------------------------------------------------------------------*/
index 05a7861..f565341 100644 (file)
@@ -127,6 +127,7 @@ libsciconsole_minimal_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/symbol/includes \
 -I$(top_srcdir)/modules/operations/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 # Includes need for the compilation
@@ -157,6 +158,7 @@ libsciconsole_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/commons/src/jni \
 -I$(top_srcdir)/modules/dynamic_link/includes \
 $(JAVA_JNI_INCLUDE) \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 
index 103ccb9..5a86f97 100644 (file)
@@ -712,6 +712,7 @@ libsciconsole_minimal_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/symbol/includes \
 -I$(top_srcdir)/modules/operations/includes \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 
@@ -739,7 +740,8 @@ libsciconsole_la_CPPFLAGS =  \
        -I$(top_srcdir)/modules/localization/includes \
        -I$(top_srcdir)/modules/commons/src/jni \
        -I$(top_srcdir)/modules/dynamic_link/includes \
-       $(JAVA_JNI_INCLUDE) $(AM_CPPFLAGS) $(am__append_4)
+       $(JAVA_JNI_INCLUDE) $(EIGEN_CPPFLAGS) $(AM_CPPFLAGS) \
+       $(am__append_4)
 
 # Name of the library
 pkglib_LTLIBRARIES = libsciconsole-minimal.la $(am__append_5)
index 481a7d2..b6f99e0 100644 (file)
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../src/cpp;../../../types/includes;../../../ast/includes;../../../api_scilab/includes;../../../symbol/includes;../../../core/includes;../../../localization/includes;../../../../libs/intl;../../../operations/includes;../../../output_stream/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 9dc9994..f08f02d 100644 (file)
@@ -85,7 +85,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../../../core/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../../libs/intl;../../../localization/includes;../../../string/includes;../../../system_env/includes;../../../fileio/includes;../../../history_manager/includes;../../../api_scilab/includes;../../../completion/includes;../../../output_stream/includes;../../../operations/includes;../../../threads/includes;../../../windows_tools/includes;../../../ui_data/includes;../../../windows_tools/src/c/scilab_windows;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 198c3bf..abde853 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../c;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../windows_tools/src/c/scilab_windows;../../../completion/includes;../../../localization/includes;../../../operations/includes;../../../history_manager/includes;../../../ui_data/includes;../../../../libs/intl;../../../system_env/includes;../../../threads/includes;../../../string/includes;../../../fileio/includes;../../../jvm/includes;../../../core/includes../../../../libs/intl;../../../types/includes;../../../ast/includes;../../../commons/src/jni;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;CONSOLE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index b5ba551..6bd0f7e 100644 (file)
@@ -38,6 +38,7 @@ libscidata_structures_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/operations/includes/ \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 if MAINTAINER_MODE
index c179ab2..6d3ddb7 100644 (file)
@@ -608,6 +608,7 @@ libscidata_structures_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/localization/includes/ \
 -I$(top_srcdir)/modules/api_scilab/includes/ \
 -I$(top_srcdir)/modules/operations/includes/ \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidata_structures.la
index ab8f890..68860dd 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DATA_STRUCTURES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -109,7 +109,7 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DATA_STRUCTURES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -136,7 +136,7 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DATA_STRUCTURES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -170,7 +170,7 @@ lib /DEF:"$(ProjectDir)linpack_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platf
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../string/includes;../../../core/includes;../../../output_stream/includes;../../../dynamic_link/includes;../../../dynamic_link/src/c;../../../localization/includes;../../../core/src/c;../../../../libs/intl;../../../data_structures/includes;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DATA_STRUCTURES_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index df12ad8..c4bd988 100644 (file)
@@ -30,8 +30,8 @@ GATEWAY_CPP_SOURCES = \
 libscidynamic_link_la_CPPFLAGS = \
        -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/modules/io/includes/ \
-    -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/io/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/operations/includes/ \
        -I$(top_srcdir)/modules/symbol/includes/ \
        -I$(top_srcdir)/modules/types/includes/ \
@@ -39,12 +39,13 @@ libscidynamic_link_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/functions_manager/includes/ \
        -I$(top_srcdir)/modules/ast/includes/ \
        -I$(top_srcdir)/modules/ast/includes/exps \
-    -I$(top_srcdir)/modules/string/includes/ \
-    -I$(top_srcdir)/modules/fileio/includes/ \
-    -I$(top_srcdir)/modules/system_env/includes/ \
-    -I$(top_srcdir)/modules/threads/includes/ \
-    -I$(top_srcdir)/modules/localization/includes/ \
-    $(AM_CPPFLAGS)
+       -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
+       -I$(top_srcdir)/modules/threads/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 if MAINTAINER_MODE
 pkglib_LTLIBRARIES = libscidynamic_link.la
index 1dc86db..2b3f5ff 100644 (file)
@@ -599,8 +599,8 @@ GATEWAY_CPP_SOURCES = \
 libscidynamic_link_la_CPPFLAGS = \
        -I$(srcdir)/includes/ \
        -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/modules/io/includes/ \
-    -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/io/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
        -I$(top_srcdir)/modules/operations/includes/ \
        -I$(top_srcdir)/modules/symbol/includes/ \
        -I$(top_srcdir)/modules/types/includes/ \
@@ -608,12 +608,13 @@ libscidynamic_link_la_CPPFLAGS = \
        -I$(top_srcdir)/modules/functions_manager/includes/ \
        -I$(top_srcdir)/modules/ast/includes/ \
        -I$(top_srcdir)/modules/ast/includes/exps \
-    -I$(top_srcdir)/modules/string/includes/ \
-    -I$(top_srcdir)/modules/fileio/includes/ \
-    -I$(top_srcdir)/modules/system_env/includes/ \
-    -I$(top_srcdir)/modules/threads/includes/ \
-    -I$(top_srcdir)/modules/localization/includes/ \
-    $(AM_CPPFLAGS)
+       -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
+       -I$(top_srcdir)/modules/threads/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscidynamic_link.la
 @MAINTAINER_MODE_FALSE@noinst_LTLIBRARIES = libscidynamic_link-algo.la libscidynamic_link.la
index 019bd51..3e12e4c 100644 (file)
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../api_scilab/includes;../../../symbol/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../localization/includes;../../../operations/includes;../../../output_stream/includes;../../../../libs/intl;../../../string/includes;../../../functions_manager/includes;../../../system_env/includes;../../../threads/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 2260075..8adab0f 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -109,7 +109,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -136,7 +136,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -170,7 +170,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../windows_tools/includes;../../../operations/includes;../../../localization/includes;../../../io/includes;../../../core/includes;../../../fileio/includes../../../api_scilab/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../threads/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;DYNAMIC_LINK_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 7a8ca1e..e2822c0 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -112,7 +112,7 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -142,7 +142,7 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -180,7 +180,7 @@ lib /DEF:"$(ProjectDir)preferences_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Pla
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../windows_tools/includes;../api_scilab/includes;../core/includes;../string/includes;../output_stream/includes;../io/includes;../localization/includes;../../libs/intl;../operations/includes;../symbol/includes;../types/includes;../ast/includes;../system_env/includes;../../libs/curl/include;../../libs/libxml2;../dynamic_link/includes;../preferences/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;FILEIO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index f5301e5..006d476 100644 (file)
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -117,7 +117,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -153,7 +153,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -199,7 +199,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
       <Optimization>MaxSpeed</Optimization>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../../java/jdk/include;../../java/jdk/include/win32;../output_stream/includes;../fileio/includes;../gui/includes;../core/includes;../localization/includes;../../libs/intl;src/c;src/c/getHandleProperty;../renderer/includes;../jvm/includes;includes/handleDrawing;../action_binding/includes;../graphic_export/includes;../string/includes;../windows_tools/includes;../api_scilab/includes;../operations/includes;../system_env/includes;../elementary_functions/includes;../graphic_objects/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index aa80bd0..2eeaa71 100644 (file)
     <None Include="locales\graphics.pot" />
     <None Include="locales\graphics.pot" />
     <None Include="locales\graphics.pot" />
+    <None Include="locales\graphics.pot" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="graphic.rc">
index 29fed80..1e9ee00 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../c/getHandleProperty;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../symbol/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;GRAPHICS_GW_EXPORTS;GRAPHICS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index d3c0cc0..d00c19e 100755 (executable)
@@ -249,6 +249,7 @@ libscigui_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/commons/src/jni/ \
 -I$(top_srcdir)/modules/dynamic_link/includes \
 $(JAVA_JNI_INCLUDE) \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 # Without the GUI module
index 08925ec..e0632ea 100644 (file)
@@ -932,6 +932,7 @@ libscigui_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/commons/src/jni/ \
 -I$(top_srcdir)/modules/dynamic_link/includes \
 $(JAVA_JNI_INCLUDE) \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 
index 195448f..c623b1a 100644 (file)
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/jni;../../../operations/includes;../../../types/includes;../../../core/includes;../../../ast/includes;../../../symbol/includes;../../../localization/includes;../../../../libs/intl;../../../jvm/includes;../../../output_stream/includes;../../../../java/jdk/include/win32;../../../../java/jdk/include;../../../commons/src/jni;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GUI_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 605f220..d63257d 100644 (file)
@@ -105,6 +105,7 @@ libscihdf5_la_CPPFLAGS = \
        $(JAVA_JNI_INCLUDE) \
        $(HDF5_CFLAGS) \
        $(AM_CPPFLAGS) \
+       $(EIGEN_CPPFLAGS) \
        $(FORCE_HDF_1.8_API)
 
 
index 7297a27..a781c03 100644 (file)
@@ -693,6 +693,7 @@ libscihdf5_la_CPPFLAGS = \
        $(JAVA_JNI_INCLUDE) \
        $(HDF5_CFLAGS) \
        $(AM_CPPFLAGS) \
+       $(EIGEN_CPPFLAGS) \
        $(FORCE_HDF_1.8_API)
 
 
index 839b479..06c986d 100644 (file)
  *
  */
 
+#include "mlist.hxx"
+#include "int.hxx"
+
 #include "H5Exception.hxx"
 #include "HDF5Scilab.hxx"
 #include "H5Object.hxx"
-#include "mlist.hxx"
-#include "int.hxx"
 
 extern "C"
 {
index da7d87a..ddc9a7f 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>H5Topen_vers=2;H5Dcreate_vers=2;H5Aiterate_vers=2;H5Gcreate_vers=2;H5Gopen_vers=2;H5Tget_array_dims_vers=2;H5Acreate_vers=2;_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>H5Topen_vers=2;H5Dcreate_vers=2;H5Aiterate_vers=2;H5Gcreate_vers=2;H5Gopen_vers=2;H5Tget_array_dims_vers=2;H5Acreate_vers=2;_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>H5Topen_vers=2;H5Dcreate_vers=2;H5Aiterate_vers=2;H5Gcreate_vers=2;H5Gopen_vers=2;H5Tget_array_dims_vers=2;H5Acreate_vers=2;_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../core/includes;../../../api_scilab/includes;../../../localization/includes;../../../../libs/intl;../../../../libs/hdf5/include;../../../windows_tools/includes;../../../fileio/includes;../../../commons/src/jni;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../jni;../cpp;../../../operations/includes;../../../string/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>H5Topen_vers=2;H5Dcreate_vers=2;H5Aiterate_vers=2;H5Gcreate_vers=2;H5Gopen_vers=2;H5Tget_array_dims_vers=2;H5Acreate_vers=2;_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HDF5_SCILAB_EXPORTS;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 6ae3593..49166fa 100644 (file)
@@ -41,23 +41,23 @@ endif
 pkglib_LTLIBRARIES = libscihelptools.la libscihelptools-disable.la
 
 libscihelptools_la_CPPFLAGS= \
-                $(JAVA_JNI_INCLUDE) \
-                               -I$(srcdir)/src/jni/ \
-                               -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/modules/localization/includes/ \
-                               -I$(top_srcdir)/modules/jvm/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes/ \
-                               -I$(top_srcdir)/modules/system_env/includes/ \
-                               -I$(top_srcdir)/modules/operations/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/symbol/includes/ \
-                               -I$(top_srcdir)/modules/types/includes/ \
-                               -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
-                               -I$(top_srcdir)/modules/commons/src/jni \
-                -I$(top_srcdir)/modules/dynamic_link/includes \
-                               $(AM_CPPFLAGS)
-
+       $(JAVA_JNI_INCLUDE) \
+       -I$(srcdir)/src/jni/ \
+       -I$(srcdir)/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
+       -I$(top_srcdir)/modules/operations/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/symbol/includes/ \
+       -I$(top_srcdir)/modules/types/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/exps \
+       -I$(top_srcdir)/modules/commons/src/jni \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 libscihelptools_la_SOURCES =  $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
 
index 436fbe3..2ced282 100644 (file)
@@ -596,22 +596,23 @@ yacc_present = @yacc_present@
 @BUILD_HELP_TRUE@@GIWS_TRUE@@GUI_TRUE@BUILT_SOURCES = giws
 pkglib_LTLIBRARIES = libscihelptools.la libscihelptools-disable.la
 libscihelptools_la_CPPFLAGS = \
-                $(JAVA_JNI_INCLUDE) \
-                               -I$(srcdir)/src/jni/ \
-                               -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/modules/localization/includes/ \
-                               -I$(top_srcdir)/modules/jvm/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes/ \
-                               -I$(top_srcdir)/modules/system_env/includes/ \
-                               -I$(top_srcdir)/modules/operations/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/symbol/includes/ \
-                               -I$(top_srcdir)/modules/types/includes/ \
-                               -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
-                               -I$(top_srcdir)/modules/commons/src/jni \
-                -I$(top_srcdir)/modules/dynamic_link/includes \
-                               $(AM_CPPFLAGS)
+       $(JAVA_JNI_INCLUDE) \
+       -I$(srcdir)/src/jni/ \
+       -I$(srcdir)/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/jvm/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
+       -I$(top_srcdir)/modules/operations/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/symbol/includes/ \
+       -I$(top_srcdir)/modules/types/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/exps \
+       -I$(top_srcdir)/modules/commons/src/jni \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 libscihelptools_la_SOURCES = $(GATEWAY_C_SOURCES) $(GATEWAY_CXX_SOURCES)
 libscihelptools_disable_la_CPPFLAGS = $(libscihelptools_la_CPPFLAGS)
index a5acee0..73ee74c 100644 (file)
@@ -66,6 +66,7 @@ $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/ast/includes/exps \
 -I$(top_srcdir)/modules/string/includes/ \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 # Name of the future library (.la will be replace by .so, .a, etc regarding
index f641f9c..234938d 100644 (file)
@@ -631,6 +631,7 @@ $(JAVA_JNI_INCLUDE) \
 -I$(top_srcdir)/modules/ast/includes/exps \
 -I$(top_srcdir)/modules/string/includes/ \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 
index 9288f7c..d31f103 100644 (file)
@@ -85,7 +85,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../src/cpp;..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../fileio/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;HISTORY_MANAGER_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 1d7f8b2..21dd52f 100644 (file)
@@ -46,7 +46,8 @@ libsciinterpolation_la_CPPFLAGS= \
 -I$(top_srcdir)/modules/types/includes \
 -I$(top_srcdir)/modules/operations/includes \
 -I$(top_srcdir)/modules/string/includes \
--I$(top_srcdir)/modules/elementary_functions/includes
+-I$(top_srcdir)/modules/elementary_functions/includes \
+$(EIGEN_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libsciinterpolation.la
 noinst_LTLIBRARIES = libsciinterpolation-algo.la
index e84c88c..ba7bd1d 100644 (file)
@@ -615,7 +615,8 @@ libsciinterpolation_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/types/includes \
 -I$(top_srcdir)/modules/operations/includes \
 -I$(top_srcdir)/modules/string/includes \
--I$(top_srcdir)/modules/elementary_functions/includes
+-I$(top_srcdir)/modules/elementary_functions/includes \
+$(EIGEN_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libsciinterpolation.la
 noinst_LTLIBRARIES = libsciinterpolation-algo.la
index 03baba9..3000b39 100644 (file)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -111,7 +111,7 @@ lib /DEF:"$(ProjectDir)slatec_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -140,7 +140,7 @@ lib /DEF:"$(ProjectDir)slatec_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -176,7 +176,7 @@ lib /DEF:"$(ProjectDir)slatec_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../output_stream/includes;../../../localization/includes;../../../string/includes;../../../core/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../symbol/includes;../../../ast/includes;../../../threads/includes;../../../system_env/includes;../../../types/includes;../../../elementary_functions/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;INTERPOLATION_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -271,7 +271,7 @@ lib /DEF:"$(ProjectDir)slatec_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platfo
     <ProjectReference Include="..\..\..\ast\ast-tools\ast-tools.vcxproj">
       <Project>{1f4a0344-99ed-461b-bd53-1593788fb34d}</Project>
     </ProjectReference>
-</ItemGroup>
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
index 3fd4f68..2a16fd2 100644 (file)
@@ -59,6 +59,7 @@ libsciio_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/threads/includes/ \
     -I$(top_srcdir)/modules/dynamic_link/includes \
+    $(EIGEN_CPPFLAGS) \
     $(XML_FLAGS) \
     $(AM_CPPFLAGS)
 
index 7b5cec0..90aa4ed 100644 (file)
@@ -618,6 +618,7 @@ libsciio_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/localization/includes/ \
     -I$(top_srcdir)/modules/threads/includes/ \
     -I$(top_srcdir)/modules/dynamic_link/includes \
+    $(EIGEN_CPPFLAGS) \
     $(XML_FLAGS) \
     $(AM_CPPFLAGS)
 
index 6caef54..9a0e5ce 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/cpp;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../elementary_functions/includes;../../../core/includes;../../../operations/includes;../../../api_scilab/includes;../../../../libs/libxml2;../../../fileio/includes;../../../system_env/includes;../../../parse/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../threads/includes;../../src/c;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IO_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 900b1b5..2af1002 100644 (file)
@@ -30,7 +30,7 @@ libscijvm_la_CPPFLAGS = \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c \
                        -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
+                       -I$(top_srcdir)/modules/ast/includes/exps \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -42,9 +42,10 @@ libscijvm_la_CPPFLAGS = \
                        -I$(top_srcdir)/modules/functions_manager/includes/ \
                        -I$(top_srcdir)/modules/system_env/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
-            -I$(top_srcdir)/modules/dynamic_link/includes \
+                       -I$(top_srcdir)/modules/dynamic_link/includes \
                        -I$(top_srcdir)/modules/preferences/includes/ \
                        $(XML_FLAGS) \
+                       $(EIGEN_CPPFLAGS) \
                        $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscijvm-disable.la
@@ -114,7 +115,7 @@ libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES) $(JVM_DISABLE_CPP_SOURCE
 
 libscijvm_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
+                       -I$(top_srcdir)/modules/ast/includes/exps \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index 2ad0a34..00341b7 100644 (file)
@@ -606,7 +606,7 @@ libscijvm_la_CPPFLAGS = \
                        -I$(srcdir)/includes/ \
                        -I$(srcdir)/src/c \
                        -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
+                       -I$(top_srcdir)/modules/ast/includes/exps \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/ \
                        -I$(top_srcdir)/modules/api_scilab/includes/ \
@@ -618,9 +618,10 @@ libscijvm_la_CPPFLAGS = \
                        -I$(top_srcdir)/modules/functions_manager/includes/ \
                        -I$(top_srcdir)/modules/system_env/includes/ \
                        -I$(top_srcdir)/modules/fileio/includes/ \
-            -I$(top_srcdir)/modules/dynamic_link/includes \
+                       -I$(top_srcdir)/modules/dynamic_link/includes \
                        -I$(top_srcdir)/modules/preferences/includes/ \
                        $(XML_FLAGS) \
+                       $(EIGEN_CPPFLAGS) \
                        $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscijvm-disable.la $(am__append_1)
@@ -678,7 +679,7 @@ JVM_DISABLE_CPP_SOURCES = src/nojvm/nojvm_gw.cpp
 libscijvm_disable_la_SOURCES = $(JVM_DISABLE_C_SOURCES) $(JVM_DISABLE_CPP_SOURCES)
 libscijvm_disable_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
+                       -I$(top_srcdir)/modules/ast/includes/exps \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
index 4bbcbd9..52ba9a0 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../api_scilab/includes;..\..\src/c;../../../operations/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBJVM_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index d2a660f..84c8538 100644 (file)
@@ -45,14 +45,15 @@ libscilocalization_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/core/includes/ \
                                -I$(top_srcdir)/modules/symbol/includes/ \
                                -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
+                               -I$(top_srcdir)/modules/ast/includes/exps \
                                -I$(top_srcdir)/modules/system_env/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/operations/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
-                -I$(top_srcdir)/modules/dynamic_link/includes \
+                               -I$(top_srcdir)/modules/dynamic_link/includes/ \
+                               $(EIGEN_CPPFLAGS) \
                                $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscilocalization.la
index 2b5e569..a347620 100644 (file)
@@ -615,14 +615,15 @@ libscilocalization_la_CPPFLAGS = $(JAVA_JNI_INCLUDE) \
                                -I$(top_srcdir)/modules/core/includes/ \
                                -I$(top_srcdir)/modules/symbol/includes/ \
                                -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
+                               -I$(top_srcdir)/modules/ast/includes/exps \
                                -I$(top_srcdir)/modules/system_env/includes/ \
                                -I$(top_srcdir)/modules/string/includes/ \
                                -I$(top_srcdir)/modules/fileio/includes/ \
                                -I$(top_srcdir)/modules/api_scilab/includes/ \
                                -I$(top_srcdir)/modules/operations/includes/ \
                                -I$(top_srcdir)/modules/output_stream/includes/ \
-                -I$(top_srcdir)/modules/dynamic_link/includes \
+                               -I$(top_srcdir)/modules/dynamic_link/includes/ \
+                               $(EIGEN_CPPFLAGS) \
                                $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscilocalization.la
index 628d871..cbd6342 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LOCALIZATION_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LOCALIZATION_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LOCALIZATION_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\includes;..\..\src\c;..\..\..\functions_manager\includes;..\..\..\types\includes;..\..\..\core\includes;..\..\..\symbol\includes;..\..\..\ast\includes;../../../system_env/includes;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../output_stream/includes;../../../../libs/GetWindowsVersion;../../../api_scilab/includes;../../../operations/includes;../../../dynamic_link/includes;../../../fileio/includes;../../../fileio/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LOCALIZATION_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 476cab3..5198e72 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -119,7 +119,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -156,7 +156,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -200,7 +200,7 @@ lib /DEF:"$(ProjectDir)core_f_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Platform
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../jni;../cpp;../../../core/includes;../../../api_scilab/includes;../../../jvm/includes;../../../../java/jdk/include;../../../../java/jdk/include/win32;../../../localization/includes;../../../../libs/intl;../../../string/includes;../../../windows_tools/includes;../../../system_env/includes;../../../operations/includes;../../../types/includes;../../../console/includes;../../../console/src/c/windows;../../../threads/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;OUTPUT_STREAM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index ea35f4d..ed19b03 100644 (file)
@@ -54,8 +54,8 @@ libsciparse_la_SOURCES        = $(PARSE_CXX_SOURCES)
 libsciparse_la_CPPFLAGS = \
        -Iincludes \
        -Isrc/cpp \
-    -I$(top_srcdir)/modules/dynamic_link/includes \
-    -I$(top_srcdir)/libs/MALLOC/includes \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       -I$(top_srcdir)/libs/MALLOC/includes \
        -I$(top_builddir)/modules/core/includes \
        -I$(top_builddir)/modules/ast/includes \
        -I$(top_srcdir)/modules/ast/includes/exps \
@@ -65,6 +65,7 @@ libsciparse_la_CPPFLAGS = \
        -I$(top_builddir)/modules/output_stream/includes \
        -I$(top_builddir)/modules/string/includes \
        -I$(top_builddir)/modules/system_env/includes \
+       $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 #### parse : include files ####
index 1317e32..5a66439 100644 (file)
@@ -537,8 +537,8 @@ libsciparse_la_SOURCES = $(PARSE_CXX_SOURCES)
 libsciparse_la_CPPFLAGS = \
        -Iincludes \
        -Isrc/cpp \
-    -I$(top_srcdir)/modules/dynamic_link/includes \
-    -I$(top_srcdir)/libs/MALLOC/includes \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       -I$(top_srcdir)/libs/MALLOC/includes \
        -I$(top_builddir)/modules/core/includes \
        -I$(top_builddir)/modules/ast/includes \
        -I$(top_srcdir)/modules/ast/includes/exps \
@@ -548,6 +548,7 @@ libsciparse_la_CPPFLAGS = \
        -I$(top_builddir)/modules/output_stream/includes \
        -I$(top_builddir)/modules/string/includes \
        -I$(top_builddir)/modules/system_env/includes \
+       $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 
index d4a6eda..b983ec4 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PARSE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;PARSE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PARSE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\ast\includes;../ast/includes/exps;..\symbol\includes;..\core\includes;../types/includes;../localization/includes;../output_stream/includes;../../libs/intl;../string/includes;../system_env/includes;../dynamic_link/includes;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;PARSE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index 8575d34..595af75 100644 (file)
@@ -44,21 +44,22 @@ RANDLIB_CPP_SOURCES = src/cpp/grand.cpp
 GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_grand.cpp
 
 libscirandlib_la_CPPFLAGS = \
-                -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/localization/includes/ \
-                               -I$(top_srcdir)/modules/dynamic_link/includes/ \
-                               -I$(top_srcdir)/modules/symbol/includes/ \
-                               -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
-                               -I$(top_srcdir)/modules/threads/includes/ \
-                               -I$(top_srcdir)/modules/system_env/includes/ \
-                -I$(top_srcdir)/modules/dynamic_link/includes \
-                               -I$(top_srcdir)/modules/types/includes/ \
-                               -I$(top_srcdir)/modules/operations/includes/ \
-                               -I$(top_srcdir)/modules/elementary_functions/includes/ \
-                               $(AM_CPPFLAGS)
+       -I$(srcdir)/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/dynamic_link/includes/ \
+       -I$(top_srcdir)/modules/symbol/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/exps \
+       -I$(top_srcdir)/modules/threads/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       -I$(top_srcdir)/modules/types/includes/ \
+       -I$(top_srcdir)/modules/operations/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscirandlib.la
 noinst_LTLIBRARIES = libscirandlib-algo.la
index 110e7c0..3248e11 100644 (file)
@@ -613,21 +613,22 @@ src/fortran/gennor.f
 RANDLIB_CPP_SOURCES = src/cpp/grand.cpp
 GATEWAY_CPP_SOURCES = sci_gateway/cpp/sci_grand.cpp
 libscirandlib_la_CPPFLAGS = \
-                -I$(srcdir)/includes/ \
-                               -I$(top_srcdir)/modules/output_stream/includes/ \
-                               -I$(top_srcdir)/modules/api_scilab/includes/ \
-                               -I$(top_srcdir)/modules/localization/includes/ \
-                               -I$(top_srcdir)/modules/dynamic_link/includes/ \
-                               -I$(top_srcdir)/modules/symbol/includes/ \
-                               -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
-                               -I$(top_srcdir)/modules/threads/includes/ \
-                               -I$(top_srcdir)/modules/system_env/includes/ \
-                -I$(top_srcdir)/modules/dynamic_link/includes \
-                               -I$(top_srcdir)/modules/types/includes/ \
-                               -I$(top_srcdir)/modules/operations/includes/ \
-                               -I$(top_srcdir)/modules/elementary_functions/includes/ \
-                               $(AM_CPPFLAGS)
+       -I$(srcdir)/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/dynamic_link/includes/ \
+       -I$(top_srcdir)/modules/symbol/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/ \
+       -I$(top_srcdir)/modules/ast/includes/exps \
+       -I$(top_srcdir)/modules/threads/includes/ \
+       -I$(top_srcdir)/modules/system_env/includes/ \
+       -I$(top_srcdir)/modules/dynamic_link/includes \
+       -I$(top_srcdir)/modules/types/includes/ \
+       -I$(top_srcdir)/modules/operations/includes/ \
+       -I$(top_srcdir)/modules/elementary_functions/includes/ \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscirandlib.la
 noinst_LTLIBRARIES = libscirandlib-algo.la
index d5709b3..585f52a 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -110,7 +110,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
@@ -138,7 +138,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -172,7 +172,7 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../localization/includes;../../../core/includes;../../../output_stream/includes;../../../../libs/intl;../../../api_scilab/includes;../../../operations/includes;../../../types/includes;../../../ast/includes;../../../system_env/includes;../../../threads/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;RANDLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 4624103..70ad5b4 100644 (file)
@@ -93,6 +93,7 @@ libscisignal_processing_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/operations/includes/ \
     -I$(top_srcdir)/modules/symbol/includes/ \
     -I$(top_srcdir)/modules/dynamic_link/includes/ \
+    $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 
index ebc2a3f..b577890 100644 (file)
@@ -687,6 +687,7 @@ libscisignal_processing_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/operations/includes/ \
     -I$(top_srcdir)/modules/symbol/includes/ \
     -I$(top_srcdir)/modules/dynamic_link/includes/ \
+    $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscisignal_processing.la
index d48e75e..b9d6f07 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SIGNAL_PROCESSING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SIGNAL_PROCESSING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SIGNAL_PROCESSING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../../libs/intl;../../../elementary_functions/includes;../../../api_scilab/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SIGNAL_PROCESSING_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index ea64ac3..df4655c 100644 (file)
@@ -48,6 +48,7 @@ libscispreadsheet_la_CPPFLAGS= \
 -I$(top_srcdir)/modules/string/src/c/ \
 -I$(top_srcdir)/modules/io/includes/ \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 GATEWAY_C_SOURCES = \
index 62e736b..4bd6d8e 100644 (file)
@@ -610,6 +610,7 @@ libscispreadsheet_la_CPPFLAGS = \
 -I$(top_srcdir)/modules/string/src/c/ \
 -I$(top_srcdir)/modules/io/includes/ \
 -I$(top_srcdir)/modules/dynamic_link/includes \
+$(EIGEN_CPPFLAGS) \
 $(AM_CPPFLAGS)
 
 GATEWAY_C_SOURCES = \
index a5e783f..f6b58d5 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c/ripole;src/c;sci_gateway/cpp;src/cpp;../core/includes;../fileio/includes;../io/includes;../windows_tools/includes;../output_stream/includes;../localization/includes;../../libs/intl;../api_scilab/includes;../string/includes;../types/includes;../ast/includes;../operations/includes;../system_env/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;SPREADSHEET_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 1e7385e..99db1ab 100644 (file)
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;STRING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -122,7 +122,7 @@ lib /DEF:"$(ProjectDir)system_env_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;STRING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -164,7 +164,7 @@ lib /DEF:"$(ProjectDir)system_env_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;STRING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -214,7 +214,7 @@ lib /DEF:"$(ProjectDir)system_env_import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../../libs/pcre;../../../core/includes;../../../api_scilab/includes;../../../windows_tools/includes;../../../localization/includes;../../../output_stream/includes;../../../../libs/hashtable;../../../../libs/intl;../../../operations/includes;../../../system_env/includes;../../../types/includes;../../../ast/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;STRING_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 1d63549..944d9d6 100644 (file)
@@ -21,7 +21,7 @@ libscisymbol_la_SOURCES       = $(SYMBOL_CXX_SOURCES)
 libscisymbol_la_CPPFLAGS = \
        -I includes/ \
        -I src/cpp \
-    -I$(top_srcdir)/modules/dynamic_link/includes \
+        -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_builddir)/modules/types/includes \
        -I$(top_builddir)/modules/functions_manager/includes \
        -I$(top_builddir)/modules/elementary_functions/includes \
@@ -29,6 +29,7 @@ libscisymbol_la_CPPFLAGS = \
        -I$(top_builddir)/modules/ast/includes \
        -I$(top_builddir)/modules/ast/includes/exps \
        -I$(top_builddir)/modules/localization/includes \
+       $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 
index 611d8fd..9be330b 100644 (file)
@@ -519,7 +519,7 @@ libscisymbol_la_SOURCES = $(SYMBOL_CXX_SOURCES)
 libscisymbol_la_CPPFLAGS = \
        -I includes/ \
        -I src/cpp \
-    -I$(top_srcdir)/modules/dynamic_link/includes \
+        -I$(top_srcdir)/modules/dynamic_link/includes \
        -I$(top_builddir)/modules/types/includes \
        -I$(top_builddir)/modules/functions_manager/includes \
        -I$(top_builddir)/modules/elementary_functions/includes \
@@ -527,6 +527,7 @@ libscisymbol_la_CPPFLAGS = \
        -I$(top_builddir)/modules/ast/includes \
        -I$(top_builddir)/modules/ast/includes/exps \
        -I$(top_builddir)/modules/localization/includes \
+       $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 libscisymbol_la_LIBADD = 
index f643c46..f301d8e 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SYMBOL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SYMBOL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYMBOL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;../types/includes;../elementary_functions/includes;../core/includes;../operations/includes;../ast/includes;../localization/includes;../../libs/intl;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYMBOL_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index c8264a3..d589a41 100644 (file)
@@ -34,7 +34,7 @@ libscisystem_env_la_CPPFLAGS = \
        -I includes/ \
        -I src/cpp \
        -I $(top_srcdir)/libs/MALLOC/includes/ \
-    -I $(top_srcdir)/modules/dynamic_link/includes \
+       -I $(top_srcdir)/modules/dynamic_link/includes \
        -I $(top_srcdir)/modules/api_scilab/includes/ \
        -I $(top_srcdir)/modules/ast/includes/ \
        -I $(top_srcdir)/modules/ast/includes/exps \
@@ -49,6 +49,7 @@ libscisystem_env_la_CPPFLAGS = \
        -I $(top_srcdir)/modules/differential_equations/includes/ \
        -I $(top_srcdir)/modules/output_stream/includes/ \
        -I $(top_srcdir)/modules/localization/includes/ \
+       $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 
index 05ce1ab..fba57e3 100644 (file)
@@ -527,7 +527,7 @@ libscisystem_env_la_CPPFLAGS = \
        -I includes/ \
        -I src/cpp \
        -I $(top_srcdir)/libs/MALLOC/includes/ \
-    -I $(top_srcdir)/modules/dynamic_link/includes \
+       -I $(top_srcdir)/modules/dynamic_link/includes \
        -I $(top_srcdir)/modules/api_scilab/includes/ \
        -I $(top_srcdir)/modules/ast/includes/ \
        -I $(top_srcdir)/modules/ast/includes/exps \
@@ -542,6 +542,7 @@ libscisystem_env_la_CPPFLAGS = \
        -I $(top_srcdir)/modules/differential_equations/includes/ \
        -I $(top_srcdir)/modules/output_stream/includes/ \
        -I $(top_srcdir)/modules/localization/includes/ \
+       $(EIGEN_CPPFLAGS) \
        $(AM_CPPFLAGS)
 
 
index 9ae7cfb..604a986 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;..\core\includes;../symbol/includes;../types/includes;../ast/includes;../windows_tools/includes;../localization/includes;../io/includes;../../libs/intl;../fileio/includes;../string/includes;../threads/includes;../differential_equations/includes;../elementary_functions/includes;../api_scilab/includes;../operations/includes;../dynamic_link/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SYSTEM_ENV_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index aaeb12b..ca2a3f9 100644 (file)
@@ -27,10 +27,11 @@ libscitime_la_CPPFLAGS= -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/ \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
-            -I$(top_srcdir)/modules/dynamic_link/includes \
+                       -I$(top_srcdir)/modules/ast/includes/exps \
+                       -I$(top_srcdir)/modules/dynamic_link/includes \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
+                       $(EIGEN_CPPFLAGS) \
                        $(AM_CPPFLAGS)
 
 if MAINTAINER_MODE
index dd2f1be..253d102 100644 (file)
@@ -580,10 +580,11 @@ libscitime_la_CPPFLAGS = -I$(srcdir)/includes/ \
                        -I$(top_srcdir)/modules/symbol/includes/ \
                        -I$(top_srcdir)/modules/types/includes/ \
                        -I$(top_srcdir)/modules/ast/includes/ \
-               -I$(top_srcdir)/modules/ast/includes/exps \
-            -I$(top_srcdir)/modules/dynamic_link/includes \
+                       -I$(top_srcdir)/modules/ast/includes/exps \
+                       -I$(top_srcdir)/modules/dynamic_link/includes \
                        -I$(top_srcdir)/modules/localization/includes/ \
                        -I$(top_srcdir)/modules/output_stream/includes/ \
+                       $(EIGEN_CPPFLAGS) \
                        $(AM_CPPFLAGS)
 
 @MAINTAINER_MODE_TRUE@pkglib_LTLIBRARIES = libscitime.la
index 5324914..5ab9f66 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TIME_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TIME_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TIME_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../../includes;../../src/c;../../../functions_manager/includes;../../../types/includes;../../../symbol/includes;../../../ast/includes;../../../operations/includes;../../../api_scilab/includes;../../../core/includes;../../../elementary_functions/includes;../../../localization/includes;../../../../libs/intl;../../../output_stream/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TIME_GW_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index c59d078..4796e08 100644 (file)
@@ -39,8 +39,12 @@ TYPES_IMPEXP int getIntValueFromDouble(InternalType* _pIT, int _iPos);
 TYPES_IMPEXP double* getDoubleArrayFromDouble(InternalType* _pIT);
 TYPES_IMPEXP bool checkArgValidity(typed_list& _pArg);
 
+/*    template<typename T>
+    inline bool _neg_(InternalType * in, InternalType *& out);
+*/
+
 template <typename T>
-class TYPES_IMPEXP ArrayOf : public GenericType
+class ArrayOf : public GenericType
 {
 public:
     typedef T type;
@@ -166,6 +170,10 @@ public :
         return type_traits::isTrue<T>(m_iSize, m_pRealData);
     }
 
+    // The function is not write here because we needs to create a Bool which inherits from ArrayOf<int>
+    // so it will create a cyclic dependency... so the body of the function is in bool.hxx after the Bool definition.
+    virtual bool neg(InternalType *& out);
+
     virtual bool isVector() //only one dim must be != 1
     {
         bool bFirstChance = false;
@@ -1527,6 +1535,8 @@ public :
         return ostr.str();
     }
 };
+
+
 }
 
 #endif /* !__ARRAYOF_HXX__ */
index 66fcf36..3f0c807 100644 (file)
@@ -78,6 +78,17 @@ private :
     virtual void            deleteImg();
     virtual int*            allocData(int _iSize);
 };
+
+// See the comment before ArrayOf<T>::neg to explain why the definition is here !!
+template<typename T>
+inline bool ArrayOf<T>::neg(InternalType *& out)
+{
+    out = new Bool(this->m_iDims, this->m_piDims);
+    type_traits::neg<T, int>(this->m_iSize, this->m_pRealData, static_cast<Bool *>(out)->get());
+
+    return true;
+}
+
 }
 
 #ifdef _MSC_VER
index d54ec19..86bf356 100644 (file)
@@ -98,6 +98,11 @@ public :
         return false;
     }
 
+    virtual bool neg(InternalType *& out)
+    {
+        return false;
+    }
+
 private :
     virtual InternalType*   getNullValue();
     virtual Cell*           createEmpty(int _iDims, int* _piDims, bool _bComplex = false);
index a6045c7..e545641 100644 (file)
@@ -23,6 +23,7 @@
 #define __DOUBLE_HXX__
 
 #include "arrayof.hxx"
+#include "bool.hxx"
 #include "dynlib_types.h"
 
 namespace types
@@ -83,6 +84,17 @@ public :
         return type_traits::isTrue<double>(m_iSize, m_pRealData);
     }
 
+    bool neg(InternalType *& out)
+    {
+        if (isEmpty())
+        {
+            out = Empty();
+            return true;
+        }
+
+        return ArrayOf<double>::neg(out);
+    }
+
     void                        setViewAsInteger(bool _bViewAsInteger = true)
     {
         m_bViewAsInteger = _bViewAsInteger;
index 32dac79..56b9a81 100644 (file)
@@ -14,6 +14,7 @@
 #define __GRAPHICHANDLE_HXX__
 
 #include "arrayof.hxx"
+#include "bool.hxx"
 
 namespace types
 {
@@ -64,6 +65,11 @@ public :
         return false;
     }
 
+    virtual bool neg(InternalType *& out)
+    {
+        return false;
+    }
+
 protected :
     ScilabType                         getType(void);
 
index 73acb29..c717507 100644 (file)
@@ -19,6 +19,7 @@
 #define __INT_HXX__
 
 #include "arrayof.hxx"
+#include "bool.hxx"
 #include "dynlib_types.h"
 #include "internal.hxx"
 
@@ -86,7 +87,7 @@ public :
 
     InternalType* clone()
     {
-        Int<T> *pbClone =  new Int<T>(GenericType::getDims(), GenericType::getDimsArray());
+        Int<T> *pbClone = new Int<T>(GenericType::getDims(), GenericType::getDimsArray());
         pbClone->set(ArrayOf<T>::get());
         return pbClone;
     }
@@ -99,6 +100,14 @@ public :
         return true;
     }
 
+    bool neg(InternalType *& out)
+    {
+        out = new Int<T>(this->getDims(), this->getDimsArray());
+        type_traits::bin_neg<T, T>(this->m_iSize, this->m_pRealData, static_cast<Int<T> *>(out)->get());
+
+        return true;
+    }
+
     bool operator==(const InternalType& it)
     {
         if (const_cast<InternalType &>(it).getType() != getType())
index 46316a3..bc5cc2e 100644 (file)
@@ -142,6 +142,11 @@ public :
         return false;
     }
 
+    virtual bool neg(InternalType *& out)
+    {
+        return false;
+    }
+
     /* return type as string ( double, int, cell, list, ... )*/
     virtual std::wstring            getTypeStr() = 0;
     /* return type as short string ( s, i, ce, l, ... )*/
index 6a1236a..e015105 100644 (file)
@@ -15,9 +15,9 @@
 
 //only on windows 32 bits with Microsoft C/C++ compiler
 #if defined(_MSC_VER) && !defined(_WIN64) && !defined(__INTEL_COMPILER)
-    //since VS2012 /arch flag has change and Eigen failed to compile with SSE2 enabled
-    #define _mm_free(a)      _aligned_free(a)
-    #define _mm_malloc(a, b)    _aligned_malloc(a, b)
+//since VS2012 /arch flag has change and Eigen failed to compile with SSE2 enabled
+#define _mm_free(a)      _aligned_free(a)
+#define _mm_malloc(a, b)    _aligned_malloc(a, b)
 #endif
 
 #include <Eigen/Sparse>
@@ -577,6 +577,15 @@ struct TYPES_IMPEXP SparseBool : GenericType
         return (getRows() == 1 && getCols() == 1);
     }
 
+    bool neg(InternalType *& out)
+    {
+        SparseBool * _out = new SparseBool(getRows(), getCols());
+        type_traits::neg(getRows(), getCols(), matrixBool, _out->matrixBool);
+        out = _out;
+
+        return true;
+    }
+
     void whoAmI() SPARSE_CONST;
 
     bool get(int r, int c) SPARSE_CONST;
index e7608dc..b689988 100644 (file)
@@ -26,6 +26,7 @@
 #include <list>
 
 #include "arrayof.hxx"
+#include "bool.hxx"
 #include "dynlib_types.h"
 
 namespace types
@@ -77,6 +78,11 @@ public :
         return false;
     }
 
+    virtual bool neg(InternalType *& out)
+    {
+        return false;
+    }
+
 private :
     void                    deleteString(int _iRows, int _iCols);
     void                    deleteString(int _iPos);
index d7fcfc9..462db20 100644 (file)
@@ -84,6 +84,11 @@ public :
         return false;
     }
 
+    virtual bool neg(InternalType *& out)
+    {
+        return false;
+    }
+
     bool                        subMatrixToString(std::wostringstream& ostr, int* _piDims, int _iDims);
     String*                     getFieldNames();
     bool                        exists(const std::wstring& _sKey);
index c7c98d2..949a60e 100644 (file)
@@ -1,7 +1,6 @@
 /*
  *  Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- *  Copyright (C) 2008-2008 - DIGITEO - Antoine ELIAS
- *  Copyright (C) 2010-2010 - DIGITEO - Bruno JOFRET
+ *  Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
  *
  *  This file must be used under the terms of the CeCILL.
  *  This source file is licensed as described in the file COPYING, which
@@ -15,6 +14,8 @@
 #ifndef __TYPE_TRAITS_HXX__
 #define __TYPE_TRAITS_HXX__
 
+#include <Eigen/Sparse>
+
 namespace types
 {
 
@@ -34,6 +35,37 @@ struct type_traits
 
         return true;
     }
+
+    template<typename T, typename U>
+    inline static void neg(const int size, const T * const in, U * const out)
+    {
+        for (int i = 0; i < size; i++)
+        {
+            out[i] = !in[i]; //in[i] == 0 ? 1 : 0;
+        }
+    }
+
+    inline static void neg(const int r, const int c, const Eigen::SparseMatrix<bool> * const in, Eigen::SparseMatrix<bool> * const out)
+    {
+        for (int i = 0; i < r; i++)
+        {
+            for (int j = 0; j < c; j++)
+            {
+                out->coeffRef(i, j) = !in->coeff(i, j);
+            }
+        }
+
+        out->finalize();
+    }
+
+    template<typename T, typename U>
+    inline static void bin_neg(const int size, const T * const in, U * const out)
+    {
+        for (int i = 0; i < size; i++)
+        {
+            out[i] = ~in[i];
+        }
+    }
 };
 
 } // namespace types
index 42bb6d9..82a8a14 100644 (file)
@@ -11,6 +11,8 @@
  */
 
 #include "double.hxx"
+#include "bool.hxx"
+#include "singlepoly.hxx"
 
 namespace types
 {
@@ -99,4 +101,16 @@ bool checkArgValidity(typed_list& _Arg)
 
     return true;
 }
+/*
+    template<typename T>
+    bool _neg_(InternalType * in, InternalType *& out)
+    {
+       ArrayOf<T> * _in = static_cast<ArrayOf<T> *>(in);
+       Bool * _out = new Bool(_in->getDims(), _in->getDimsArray());
+       type_traits::neg<T, int>(_in->getSize(), _in->get(), _out->get());
+       out = _out;
+
+       return true;
+    }
+*/
 }
index 0162196..95229ef 100644 (file)
@@ -76,7 +76,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TYPESMACRO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -97,7 +97,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TYPESMACRO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TYPESMACRO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>../includes;../../core/includes;../../ast/includes;../../symbol/includes;../../localization/includes;../../../libs/intl;../../output_stream/includes;../../system_env/includes;../../string/includes;../../parse/includes;../../threads/includes;../../dynamic_link/includes;../../ast/includes/exps;../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;TYPESMACRO_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
index e6a5151..edc72a9 100644 (file)
@@ -81,7 +81,7 @@
     <ClCompile>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -122,7 +122,7 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;_DEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
@@ -164,7 +164,7 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -213,7 +213,7 @@ lib /DEF:"$(ProjectDir)System_env_Import.def" /SUBSYSTEM:WINDOWS /MACHINE:$(Plat
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;../../includes;../../../core/includes;../../../output_stream/includes;../../../localization/includes;../../../fileio/includes;../../../../libs/intl;../../../../libs/GetWindowsVersion;../../../call_scilab/src/c;../../../call_scilab/includes;./scilab_windows;../../../api_scilab/includes;../../../operations/includes;../../../system_env/includes;../../../string/includes;../../../functions_manager/includes;../../../symbol/includes;../../../types/includes;../../../ast/includes;../../../dynamic_link/includes;../../../ast/includes/exps;../../../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;FORDLL;NDEBUG;_WINDOWS;_USRDLL;WINDOWS_TOOLS_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
index 832ac20..3e3b04d 100644 (file)
@@ -88,21 +88,22 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
                      sci_gateway/cpp/sci_htmlDump.cpp
 
 libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
-    -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/modules/core/includes/ \
-    -I$(top_srcdir)/modules/api_scilab/includes/ \
-    -I$(top_srcdir)/modules/localization/includes/ \
-    -I$(top_srcdir)/modules/output_stream/includes/ \
-    -I$(top_srcdir)/modules/string/includes/ \
-    -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
+       -I$(top_srcdir)/modules/core/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/operations/includes/ \
        -I$(top_srcdir)/modules/string/includes/ \
        -I$(top_srcdir)/modules/types/includes/ \
        -I$(top_srcdir)/modules/ast/includes/ \
        -I$(top_srcdir)/modules/ast/includes/exps \
-    $(XML_FLAGS) \
-    $(AM_CPPFLAGS)
+       $(XML_FLAGS) \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 
 pkglib_LTLIBRARIES = libscixml.la
index 2466693..4cbf5ca 100644 (file)
@@ -750,21 +750,22 @@ GATEWAY_CXX_SOURCES = sci_gateway/cpp/sci_xmlRead.cpp \
                      sci_gateway/cpp/sci_htmlDump.cpp
 
 libscixml_la_CPPFLAGS = -I$(srcdir)/includes/ \
-    -I$(srcdir)/src/cpp/ \
-    -I$(srcdir)/src/c/ \
-    -I$(top_srcdir)/modules/core/includes/ \
-    -I$(top_srcdir)/modules/api_scilab/includes/ \
-    -I$(top_srcdir)/modules/localization/includes/ \
-    -I$(top_srcdir)/modules/output_stream/includes/ \
-    -I$(top_srcdir)/modules/string/includes/ \
-    -I$(top_srcdir)/modules/fileio/includes/ \
+       -I$(srcdir)/src/cpp/ \
+       -I$(srcdir)/src/c/ \
+       -I$(top_srcdir)/modules/core/includes/ \
+       -I$(top_srcdir)/modules/api_scilab/includes/ \
+       -I$(top_srcdir)/modules/localization/includes/ \
+       -I$(top_srcdir)/modules/output_stream/includes/ \
+       -I$(top_srcdir)/modules/string/includes/ \
+       -I$(top_srcdir)/modules/fileio/includes/ \
        -I$(top_srcdir)/modules/operations/includes/ \
        -I$(top_srcdir)/modules/string/includes/ \
        -I$(top_srcdir)/modules/types/includes/ \
        -I$(top_srcdir)/modules/ast/includes/ \
        -I$(top_srcdir)/modules/ast/includes/exps \
-    $(XML_FLAGS) \
-    $(AM_CPPFLAGS)
+       $(XML_FLAGS) \
+       $(EIGEN_CPPFLAGS) \
+       $(AM_CPPFLAGS)
 
 pkglib_LTLIBRARIES = libscixml.la
 noinst_LTLIBRARIES = libscixml-algo.la
index ce69c15..02d6eb9 100644 (file)
  *
  */
 
+#include "mlist.hxx"
+#include "tlist.hxx"
+#include "internal.hxx"
+#include "string.hxx"
+
 extern "C"
 {
 #include <string.h>
@@ -19,11 +24,6 @@ extern "C"
 #include "MALLOC.h"
 }
 
-#include "mlist.hxx"
-#include "tlist.hxx"
-#include "internal.hxx"
-#include "string.hxx"
-
 static const char *_XMLDoc[] = { "XMLDoc", "_id" };
 static const char *_XMLElem[] = { "XMLElem", "_id" };
 static const char *_XMLAttr[] = { "XMLAttr", "_id" };
index 645d0fc..ef673da 100644 (file)
@@ -80,7 +80,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;_DEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
       <WarningLevel>Level3</WarningLevel>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     <ClCompile>
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>includes;src/c;src/cpp;../core/includes;../output_stream/includes;../string/includes;../fileio/includes;../localization/includes;../../libs/intl;../../libs/libxml2;../api_scilab/includes;../windows_tools/includes;../operations/includes;../types/includes;../ast/includes;../ast/includes/exps;../../libs/Eigen/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>FORDLL;NDEBUG;_WINDOWS;_USRDLL;XML_SCILAB_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>