From 5cc25a552c207d37e4225c9efe5d9034e98d380f Mon Sep 17 00:00:00 2001 From: Michael Scholz Date: Fri, 15 Feb 2013 17:19:32 -0800 Subject: [PATCH 1/3] Added compat jar to classpath & upgraded makefiles to Air 3.5 --- air_vars.mk | 2 +- tools.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/air_vars.mk b/air_vars.mk index d11a5d3..60924cd 100644 --- a/air_vars.mk +++ b/air_vars.mk @@ -42,7 +42,7 @@ ANE_BUNDLED_LIBS_DIR = META-INF/ANE/iPhone-ARM-lib APK_KEYSTORE = $(KEYS_ROOT)/android.pfx APK_SIGN_OPT = -storetype PKCS12 -keystore $(APK_KEYSTORE) $(STOREPASS) APK_CONNECT = $(if $(findstring debug,$(APK_TARGET)),-connect $(shell ipconfig getifaddr en1)) -APK_TARGET = apk$(if $(DEBUG),-debug) +APK_TARGET = $(if $(DEBUG),apk-debug,apk-captive-runtime) APK_TARGET_OPT = -target $(APK_TARGET) $(APK_CONNECT) APK_ADTFLAGS = -package $(APK_TARGET_OPT) $(APK_SIGN_OPT) diff --git a/tools.mk b/tools.mk index 428c808..f761aeb 100644 --- a/tools.mk +++ b/tools.mk @@ -12,10 +12,11 @@ $(if $(wildcard $(FLEX_SDK)/include/FlashRuntimeExtensions.h),,$(error Invalid F ADT = $(FLEX_SDK)/bin/adt MXMLC = $(FLEX_SDK)/bin/mxmlc -ASCFLAGS = +configname=airmobile -swf-version=13 -debug=$(if $(DEBUG),true,false) +ASCFLAGS = +configname=airmobile -swf-version=18 -debug=$(if $(DEBUG),true,false) CLASSPATH += $(FLEX_SDK)/lib/android/FlashRuntimeExtensions.jar CLASSPATH += $(ANDROID_SDK)/tools/support/annotations.jar +CLASSPATH += $(ANDROID_SDK)/extras/android/support/v4/android-support-v4.jar CFLAGS += -I$(FLEX_SDK)/include CXXFLAGS += -I$(FLEX_SDK)/include From f7e3c5c7d07104283f29c645a30109f9dda4fb61 Mon Sep 17 00:00:00 2001 From: Michael Scholz Date: Fri, 15 Feb 2013 17:47:26 -0800 Subject: [PATCH 2/3] GITHEAD?? trying to build nativelibrary.ane --- air_rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/air_rules.mk b/air_rules.mk index 2bb71aa..43028eb 100644 --- a/air_rules.mk +++ b/air_rules.mk @@ -50,7 +50,7 @@ $(DSYM_ZIP): $(DSYM) $(call silent,ZIP $<, \ zip -9rq $@ $<) -$(APP_XML): $(APP_XML_IN) $(GIT_HEAD) +$(APP_XML): $(APP_XML_IN) $(call expandMacros) $(IPA): $(SWF) $(APP_XML) $(ANES) $(OTHER_RESOURCES) $(ICONS) $(EXPANDED_ANES) From 22b6bd050b85f12629255980581a27b61a3e2384 Mon Sep 17 00:00:00 2001 From: Michael Scholz Date: Fri, 15 Feb 2013 17:50:23 -0800 Subject: [PATCH 3/3] Try #2, build the nativelibrary.ane --- ane_rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ane_rules.mk b/ane_rules.mk index 6379fe8..86535a3 100644 --- a/ane_rules.mk +++ b/ane_rules.mk @@ -6,7 +6,7 @@ clean:: rm -fr $(ANE_ANDROID_LIB) gen cls jar rm -fr $(WIKI_DIR) -$(EXT_XML): $(EXT_XML_IN) $(GIT_HEAD) +$(EXT_XML): $(EXT_XML_IN) $(call expandMacros) $(ANE): $(EXT_XML) $(ANE_SWC) $(ANE_SWF) $(IOS_XML) $(ANE_IOS_LIB) $(ANE_ANDROID_JAR) $(ANE_BUNDLED_LIBS) $(ANE_ANDROID_JAR_DEVICE_LIBS) $(ANE_IOS_RESOURCE_DIRS)