linux compilation 2 34/17834/4
Antoine ELIAS [Tue, 1 Mar 2016 12:18:11 +0000 (13:18 +0100)]
Change-Id: Ia915a863301042d5c6a58dc54e3e8e18569d31b5

scilab/modules/graphic_objects/Makefile.am
scilab/modules/graphic_objects/Makefile.in
scilab/modules/graphic_objects/src/cpp/webutils.cpp
scilab/modules/graphic_objects/src/cpp/webutils.hxx

index b3f6475..168e191 100644 (file)
@@ -121,6 +121,7 @@ libscigraphic_objects_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/string/includes/ \
     -I$(top_srcdir)/modules/threads/includes/ \
     -I$(top_srcdir)/modules/dynamic_link/includes/ \
+    -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
     -I$(top_srcdir)/usr/include/ \
     $(JAVA_JNI_INCLUDE) \
     $(AM_CPPFLAGS)
index 6860f0f..31d189a 100644 (file)
@@ -810,6 +810,7 @@ libscigraphic_objects_la_CPPFLAGS = \
     -I$(top_srcdir)/modules/string/includes/ \
     -I$(top_srcdir)/modules/threads/includes/ \
     -I$(top_srcdir)/modules/dynamic_link/includes/ \
+    -I$(top_srcdir)/modules/graphics/src/c/getHandleProperty/ \
     -I$(top_srcdir)/usr/include/ \
     $(JAVA_JNI_INCLUDE) \
     $(AM_CPPFLAGS)
index eef1e7b..8c7b523 100644 (file)
@@ -13,7 +13,9 @@
 *
 */
 
+#include <string.h>
 #include <iostream>
+#include <cmath>
 #include "webutils.hxx"
 
 extern "C"
index ef0acbf..5fc3485 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <string>
 #include <vector>
+#include <list>
 #include <unordered_map>
 
 typedef void(*setFunction)(int, std::string&, bool);
@@ -155,7 +156,7 @@ public:
     static bool isFigure(int uid);
     static bool isUIcontrol(int uid);
     static bool isButton(int uid);
-    
+
     //create
     static bool createFigure(int uid, std::string& str);