Browse Source

Update duktape for real this time

Josh Engebretson 10 years ago
parent
commit
4a3858399e

+ 1 - 1
Source/AtomicEditor/Source/AEJavascript.h

@@ -6,7 +6,7 @@
 
 #include <Atomic/Core/Object.h>
 
-typedef void duk_context;
+#include <Duktape/duktape.h>
 
 using namespace Atomic;
 

+ 1 - 1
Source/AtomicEditor/Source/Javascript/JSErrorChecker.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-typedef void duk_context;
+#include <Duktape/duktape.h>
 
 #include <Atomic/Core/Object.h>
 

+ 1 - 1
Source/AtomicJS/Javascript/JSEventHelper.cpp

@@ -30,7 +30,7 @@ void JSEventHelper::AddEventHandler(Object* sender, StringHash eventType)
 
 void JSEventHelper::HandleEvent(StringHash eventType, VariantMap& eventData)
 {
-    JSVM* vm = JSVM::GetJSVM(context_);
+    JSVM* vm = JSVM::GetJSVM(0);
     duk_context* ctx = vm->GetJSContext();
 
     duk_idx_t top = duk_get_top(ctx);

File diff suppressed because it is too large
+ 513 - 509
Source/ThirdParty/Duktape/duktape.c


+ 2 - 2
Source/ThirdParty/Duktape/duktape.h

@@ -5,7 +5,7 @@
  *  include guard.  Other parts of the header are Duktape
  *  internal and related to platform/compiler/feature detection.
  *
- *  Git commit 9d37cf15a0cca5d3dc7c34f365072ca101d4c00e (v1.2.0-81-g9d37cf1).
+ *  Git commit e9bba790e9988e98790034f5fbf3305c8a623f42 (v1.2.0-86-ge9bba79).
  *
  *  See Duktape AUTHORS.rst and LICENSE.txt for copyright and
  *  licensing information.
@@ -3195,7 +3195,7 @@ struct duk_number_list_entry {
  * so that application code can easily log which Duktape snapshot was used.
  * Not available in the Ecmascript environment.
  */
-#define DUK_GIT_DESCRIBE                  "v1.2.0-81-g9d37cf1"
+#define DUK_GIT_DESCRIBE                  "v1.2.0-86-ge9bba79"
 
 /* Duktape debug protocol version used by this build. */
 #define DUK_DEBUG_PROTOCOL_VERSION        1

Some files were not shown because too many files changed in this diff