Proper Fix for SWIG C# Build

Change-Id: I177b045fed213e3bc647fcaee400c179117fa4b6

diff --git a/plugins/dali-swig/SWIG/dali-core.i b/plugins/dali-swig/SWIG/dali-core.i
index 3a1cd6d..29edf14 100644 (file)
--- a/plugins/dali-swig/SWIG/dali-core.i
+++ b/plugins/dali-swig/SWIG/dali-core.i
@@ -155,6 +155,7 @@ typedef std::pair< Dali::Radian, Dali::Radian > AngleThresholdPair;
 %include <dali/public-api/object/ref-object.h>
 %include <dali/public-api/object/any.h>
 
 %include <dali/public-api/object/ref-object.h>
 %include <dali/public-api/object/any.h>
 

+%include <dali/public-api/common/dali-common.h>

 %include <dali/public-api/common/intrusive-ptr.h>
 
 %include <dali/public-api/math/vector2.h>
 %include <dali/public-api/common/intrusive-ptr.h>
 
 %include <dali/public-api/math/vector2.h>

diff --git a/plugins/dali-swig/SWIG/dali.i b/plugins/dali-swig/SWIG/dali.i
index 69cbd04..4a612e9 100755 (executable)
--- a/plugins/dali-swig/SWIG/dali.i
+++ b/plugins/dali-swig/SWIG/dali.i
@@ -45,9 +45,6 @@
 %}
 #endif
 
 %}
 #endif
 

-// This define is needed to fix SWIG compilation error when compiling / parsing DALi deprecated APIs.
-#define DALI_DEPRECATED_API
-

 %{
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
 %{
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>