minor update

maurizioidini · maurizioidini · commit e87de8c80748 · 2015-04-07T17:06:48.000+02:00
diff --git a/test/testPluginMini/build.sh b/test/testPluginMini/build.sh
@@ -2,5 +2,5 @@
 # source emsdk_set_env.sh 
 
 
-emcc --bind -s MODULARIZE=1 test2.cpp -o test2.js
-emcc --bind  -s MODULARIZE=1 test1.cpp -o test1.js
+emcc --bind test2.cpp -o test2.js
+emcc --bind  test1.cpp -o test1.js
diff --git a/test/testPluginMini/index.html b/test/testPluginMini/index.html
@@ -38,23 +38,24 @@
 </head>
 <body>
     <textarea id="output" rows="8"></textarea><br>
-    <button id='testbutton'>Test!</button>
+    <button id='testbutton1'>Test1!</button>    
+    <button id='testbutton2'>Test2!</button>
     <script src="test1.js"></script>
+    <script src="test2.js"></script> 
     <script>
     //   
-        // document.getElementById("testbutton").addEventListener('click', function (){
-
+    document.getElementById("testbutton1").addEventListener('click', function (){
             // var com = new Module.Common();
-      
-            console.log("testbutton");
+            console.log("testbutton1");
             var t1 = new Module.Test1();
             console.log(t1.generate1());
-        // });
-    </script>    
-    <script src="test2.js"></script> 
-    <script>
+    });
+
+    document.getElementById("testbutton2").addEventListener('click', function (){
+        console.log("testbutton1");
         var t2 = new Module.Test2(); 
-        console.log(t2.generate2());      
+        console.log(t2.generate2());  
+     });    
     </script>
 </body>
 </html>
diff --git a/test/testPluginMini/test1.js b/test/testPluginMini/test1.js
@@ -1,6 +1,3 @@
-var Module = function(Module) {
-  Module = Module || {};
-
 // The Module object: Our interface to the outside world. We import
 // and export values on it, and do the work to get that through
 // closure compiler if necessary. There are various ways Module can be used:
@@ -14477,6 +14474,3 @@ run();
 
 
 
-
-  return Module;
-};
diff --git a/test/testPluginMini/test2.js b/test/testPluginMini/test2.js
@@ -1,6 +1,3 @@
-var Module = function(Module) {
-  Module = Module || {};
-
 // The Module object: Our interface to the outside world. We import
 // and export values on it, and do the work to get that through
 // closure compiler if necessary. There are various ways Module can be used:
@@ -10148,7 +10145,7 @@ function __ZNK10__cxxabiv121__vmi_class_type_info16search_below_dstEPNS_19__dyna
      $30 = (($this) + 8|0);
      $31 = (($info) + 24|0);
      $does_dst_type_point_to_our_static_type$0$off0 = 0;$is_dst_type_derived_from_static_type$0$off0 = 0;$p$0 = $23;
-     L37: while(1) {
+     L34: while(1) {
       $32 = ($p$0>>>0)<($26>>>0);
       if (!($32)) {
        $does_dst_type_point_to_our_static_type$0$off0$lcssa = $does_dst_type_point_to_our_static_type$0$off0;$is_dst_type_derived_from_static_type$2$off0 = $is_dst_type_derived_from_static_type$0$off0;
@@ -10180,7 +10177,7 @@ function __ZNK10__cxxabiv121__vmi_class_type_info16search_below_dstEPNS_19__dyna
          if ($46) {
           $does_dst_type_point_to_our_static_type$0$off0$lcssa = $does_dst_type_point_to_our_static_type$0$off0;$is_dst_type_derived_from_static_type$2$off0 = 1;
           label = 20;
-          break L37;
+          break L34;
          } else {
           $does_dst_type_point_to_our_static_type$1$off0 = $does_dst_type_point_to_our_static_type$0$off0;$is_dst_type_derived_from_static_type$1$off0 = 1;
           break;
@@ -10190,14 +10187,14 @@ function __ZNK10__cxxabiv121__vmi_class_type_info16search_below_dstEPNS_19__dyna
         $40 = ($39|0)==(1);
         if ($40) {
          label = 25;
-         break L37;
+         break L34;
         }
         $41 = HEAP32[$30>>2]|0;
         $42 = $41 & 2;
         $43 = ($42|0)==(0);
         if ($43) {
          label = 25;
-         break L37;
+         break L34;
         } else {
          $does_dst_type_point_to_our_static_type$1$off0 = 1;$is_dst_type_derived_from_static_type$1$off0 = 1;
         }
@@ -14477,6 +14474,3 @@ run();
 
 
 
-
-  return Module;
-};
