Adds decoder files to the web and extension; cleanup

mozilla · Jan 15, 2013 · ceaafae · ceaafae
1 parent b7dedd7
commit ceaafae
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/examples/racing/index.html b/examples/racing/index.html
@@ -51,6 +51,7 @@
     <script src="../../src/swf/shape.js"></script>
     <script src="../../src/swf/sound.js"></script>
     <script src="../../src/swf/text.js"></script>
+    <script src="../../src/swf/mp3worker.js"></script>
 
     <!-- Load AVM1 Dependencies -->
     <script src="../../src/avm1/classes.js"></script>

diff --git a/extension/firefox/Makefile b/extension/firefox/Makefile
@@ -53,23 +53,14 @@ build: clean
 	cp ../../lib/Kanvas/* build/content/lib/Kanvas/
 	mkdir build/content/lib/DataView.js
 	cp ../../lib/DataView.js/* build/content/lib/DataView.js/
+	mkdir build/content/lib/mp3
+	cp ../../lib/mp3/* build/content/lib/mp3/
 	# Removing hidden files
 	-find build -name ".DS_Store" -exec rm {} \;
 	# Packaging XPI file
 	cd build; zip -r shumway.xpi *
 
-clean: legacy-clean
+clean:
 	-rm -rf build
 
-legacy-clean:
-	# Cleaning old files
-	-rm -rf content/swf
-	-rm -rf content/flash
-	-rm -rf content/avm1
-	-rm -rf content/avm2
-	-rm -rf content/glue
-	-rm -rf content/lib
-	-rm LICENSE
-	-rm shumway.xpi
-
 PHONY: build clean legacy-clean
diff --git a/extension/firefox/content/web/viewer.html b/extension/firefox/content/web/viewer.html
@@ -34,6 +34,7 @@
     <script src="../swf/shape.js"></script>
     <script src="../swf/sound.js"></script>
     <script src="../swf/text.js"></script>
+    <script src="../swf/mp3worker.js"></script>
     <script> console.timeEnd("Load SWF Dependencies"); </script>
 
     <!-- Load AVM1 Dependencies -->

diff --git a/test/harness/slave.html b/test/harness/slave.html
@@ -36,6 +36,7 @@
     <script src="../../src/swf/shape.js"></script>
     <script src="../../src/swf/sound.js"></script>
     <script src="../../src/swf/text.js"></script>
+    <script src="../../src/swf/mp3worker.js"></script>
 
     <!-- Load AVM1 Dependencies -->
     <script src="../../src/avm1/classes.js"></script>

diff --git a/web/Makefile b/web/Makefile
@@ -51,6 +51,8 @@ build: clean \
 	cp $(SHUMWAY_ROOT)/lib/Kanvas/* build/lib/Kanvas/
 	mkdir build/lib/DataView.js
 	cp $(SHUMWAY_ROOT)/lib/DataView.js/* build/lib/DataView.js/
+	mkdir build/lib/mp3
+	cp $(SHUMWAY_ROOT)/lib/mp3/* build/lib/mp3/
 	mkdir build/lib/xstats
 	cp -R $(SHUMWAY_ROOT)/lib/xstats/* build/lib/xstats/
 	# Copy examples