Fixes bundle and bundle testing

mozilla · Feb 28, 2014 · 86638c9 · 86638c9
1 parent 992b768
commit 86638c9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/utils/builder/templates/avm2utils.js b/utils/builder/templates/avm2utils.js
@@ -16,8 +16,7 @@
  * limitations under the License.
  */
 
-enableVerifier.value = true;
-enableC4.value = true;
+Shumway.AVM2.Runtime.enableVerifier.value = true;
 release = true;
 
 var avm2Root = SHUMWAY_ROOT + "avm2/";

diff --git a/utils/builder/templates/scripts.js b/utils/builder/templates/scripts.js
@@ -29,8 +29,8 @@
 load($SHUMWAY_ROOT + "lib/DataView.js/DataView.js");
 load($SHUMWAY_ROOT + "lib/ByteArray.js");
 load($SHUMWAY_ROOT + "src/avm2/options.js");
-var Option = options.Option;
-var OptionSet = options.OptionSet;
+var Option = Shumway.Options.Option;
+var OptionSet = Shumway.Options.OptionSet;
 var coreOptions = new OptionSet("Core Options");
 
 load($SHUMWAY_ROOT + "src/swf/Timeline.js");

diff --git a/web/iframe/viewer.js b/web/iframe/viewer.js
@@ -123,6 +123,9 @@ var FileLoadingService = {
 };
 
 function parseSwf(url, movieParams, objectParams, compilerSettings) {
+  var enableVerifier = Shumway.AVM2.Runtime.enableVerifier;
+  var EXECUTION_MODE = Shumway.AVM2.Runtime.EXECUTION_MODE;
+
   enableVerifier.value = compilerSettings.verifier;
 
   console.log("Compiler settings: " + JSON.stringify(compilerSettings));