Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated Android facebook sdk to 3.0, plus changes #1

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated Android facebook sdk to 3.0, plus changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5cc25a5
Added compat jar to classpath & upgraded makefiles to Air 3.5
Feb 16, 2013
f7e3c5c
GITHEAD?? trying to build nativelibrary.ane
Feb 16, 2013
22b6bd0
Try #2, build the nativelibrary.ane
Feb 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion air_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion air_vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion ane_rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion tools.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down