diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-05-12 21:03:54 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-05-12 21:03:54 (GMT) |
| commit | 11e7301fb1f86a35e35072c8e4753095d28dc43c (patch) | |
| tree | bf05b7622966265a26cc5f5f3d7a8a7d05fe4aed /src/uscxml/plugins | |
| parent | 3cfb5df8f3b0571a529d05e51218eb9f4fdc1930 (diff) | |
| download | uscxml-11e7301fb1f86a35e35072c8e4753095d28dc43c.zip uscxml-11e7301fb1f86a35e35072c8e4753095d28dc43c.tar.gz uscxml-11e7301fb1f86a35e35072c8e4753095d28dc43c.tar.bz2 | |
Builds and links and tests ok on linux now
Diffstat (limited to 'src/uscxml/plugins')
| -rw-r--r-- | src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h | 12 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h index 55e5c1f..b65dc37 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h @@ -20,10 +20,22 @@ #ifndef JSCDATAMODEL_H_KN8TWG0V #define JSCDATAMODEL_H_KN8TWG0V +#include "uscxml/config.h" #include "uscxml/plugins/DataModel.h" #include <list> #include <set> + +/** + * There are two variants with JavaScriptCore headers + * Still beats the >20 V8 variants =D + */ +#if defined(HAS_JSC_JAVASCRIPTCORE_H) #include <JavaScriptCore/JavaScriptCore.h> +#elif defined(HAS_JSC_JAVASCRIPT_H) +#include <JavaScriptCore/JavaScript.h> +#else +#error "Did not find header for JSC?" +#endif #ifdef BUILD_AS_PLUGINS #include "uscxml/plugins/Plugins.h" diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp index 8b2bb04..bfa29d8 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp @@ -47,9 +47,9 @@ static XMLCh* JS2XMLString(const v8::Local<v8::Value>& value) { return(ret); } -// javascript magic here +// this is the version we support here +#define SWIG_V8_VERSION 0x032317 -#define SWIG_V8_VERSION 0x034000 #include "V8DOM.cpp.inc" namespace uscxml { |