From 07fbb325bd8ee72a6e870a6d6c928591471d28ad Mon Sep 17 00:00:00 2001 From: Mike Hwang Date: Wed, 11 Feb 2015 13:56:36 -0800 Subject: [PATCH 1/3] 32bit branch: Adding support for JNI libs being added to the ANE jar. --- ane_rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ane_rules.mk b/ane_rules.mk index 170b9e2..e090b16 100644 --- a/ane_rules.mk +++ b/ane_rules.mk @@ -19,7 +19,7 @@ $(ANE): $(EXT_XML) $(ANE_SWC) $(ANE_SWF) $(if $(IOS_XML),$(IOS_XML) $(ANE_IOS_LI $(if $(ANE_ANDROID_JAR), \ -platform Android-ARM $(ANE_ANDROID_JAR) $(ANE_SWF) \ $(foreach d,$(ANE_ANDROID_JAR_SOURCES), \ - $(if $(wildcard $d/res),-C $d res))) \ + $(if $(wildcard $d/res),-C $d res) $(if $(wildcard $d/libs),-C $d libs))) \ -platform default $(ANE_SWF)) $(if $(ANE_BUNDLED_LIBS), \ $(call silent,MERGE $@, \ From 6d84325665393a4a2d53ca0780cab2dc5052d60d Mon Sep 17 00:00:00 2001 From: Mike Hwang Date: Thu, 26 Feb 2015 16:39:36 -0800 Subject: [PATCH 2/3] 32bit branch: Added build rule to build c files. --- cc.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cc.mk b/cc.mk index 9793bfb..b39440e 100644 --- a/cc.mk +++ b/cc.mk @@ -18,6 +18,10 @@ $(foreach l,$(filter %_LIB_SOURCES,$(.VARIABLES)),$(call libtool,$(l:_SOURCES=)) %.o: %.m | $(DEPDIR) $(call silent,OBJC $*.m, \ $(OBJC) $(OBJCFLAGS) -MMD -MP -MF $(df).d -o $@ -c $<) + +%.o: %.c | $(DEPDIR) + $(call silent,OBJC $*.c, \ + $(OBJC) $(OBJCFLAGS) -MMD -MP -MF $(df).d -o $@ -c $<) $(DEPDIR): @mkdir $(DEPDIR) From 7eca5b1f6b56be4d405b73417b4762d62a3282f1 Mon Sep 17 00:00:00 2001 From: Mike Hwang Date: Thu, 26 Feb 2015 16:48:36 -0800 Subject: [PATCH 3/3] Added ANE_ENTRY_CLASSES variable in SWC creation in order to define custom entry classes. ANE_ENTRY_CLASSES can be defined in each project's individual Makefiles. --- ane_rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ane_rules.mk b/ane_rules.mk index e090b16..0400b1f 100644 --- a/ane_rules.mk +++ b/ane_rules.mk @@ -30,7 +30,7 @@ $(ANE): $(EXT_XML) $(ANE_SWC) $(ANE_SWF) $(if $(IOS_XML),$(IOS_XML) $(ANE_IOS_LI $(ANE_SWC): $(ANE_AS3_SRCS) $(call silent,COMPC $(ANE_CLASS), \ - $(COMPC) $(ASCFLAGS) $(foreach d,$(ANE_AS3DIR),-sp+=$d) -output $@ $(ANE_CLASS)) + $(COMPC) $(ASCFLAGS) $(foreach d,$(ANE_AS3DIR),-sp+=$d) -output $@ $(ANE_CLASS) $(ANE_ENTRY_CLASSES)) $(ANE_SWF): $(ANE_SWC) $(call silent,EXTRACT $@, unzip -qo $< $@)