ref: 823d620f8315c94db90e029987e4a12771ed79f2
parent: 6b542d68181923c61c0fd184b5b40e199630cc89
author: Sam Leitch <[email protected]>
date: Tue Mar 18 09:24:08 EDT 2014
Rebuilt flex asm file and added to repo. Updated Makefile to separate test and swc.
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
*.suo
flex/.settings/
flex/bin/
+*.swf
--- a/flex/Makefile
+++ b/flex/Makefile
@@ -4,19 +4,24 @@
FLEX:=X
BASE_CFLAGS:=-DFLASCC -O4 -I $(FLASCC)/usr/include
-check:
+swc: lib/h264bsd_asm.swc
+
+test: test/h264test.swf
+
+lib/h264bsd_asm.swc: $(SOURCES)
@if [ -d $(FLASCC)/usr/bin ] ; then true ; \
else echo "Couldn't locate FLASCC sdk directory, please invoke make with \"make FLASCC=/path/to/FLASCC/sdk ...\"" ; exit 1 ; \
fi
+ mkdir -p lib
+ "$(FLASCC)/usr/bin/gcc" $(BASE_CFLAGS) $(SOURCES) -emit-swc=h264bsd_asm -o lib/h264bsd_asm.swc
+
+test/h264test.swf: test/h264test.as lib/h264bsd_asm.swc
@if [ -d "$(FLEX)/bin" ] ; then true ; \
else echo "Couldn't locate Flex sdk directory, please invoke make with \"make FLEX=/path/to/flex ...\"" ; exit 1 ; \
fi
-swc: check
- "$(FLASCC)/usr/bin/gcc" $(BASE_CFLAGS) $(SOURCES) -emit-swc=h264bsd_asm -o lib/h264bsd_asm.swc
"$(FLEX)/bin/mxmlc" -static-link-runtime-shared-libraries -compiler.omit-trace-statements=false -library-path=lib/h264bsd_asm.swc -debug=true test/h264test.as -o test/h264test.swf
-
clean:
- rm -f *.swf *.swc *.bc *.exe
+ rm -f test/*.swf lib/*.swc *.bc *.exe
binary files /dev/null b/flex/lib/h264bsd_asm.swc differ
--- a/flex/test/h264test.as
+++ b/flex/test/h264test.as
@@ -3,7 +3,7 @@
import flash.display.Sprite;
import flash.text.TextField;
import flash.events.Event;
- import h264bsd.CModule;
+ import h264bsd_asm.CModule;
public class h264test extends Sprite
{