servo / rust-png

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.

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

Add support for android. #46

Merged

jdm merged 1 commit into servo:master from metajack:cargo-android

Sep 4, 2014

+9 −1

10 makefile.cargo

@@ -1,7 +1,15 @@
+    ifeq (androideabi,$(findstring androideabi,$(TARGET)))
+    CC := $(TARGET)-gcc
+    AR := $(TARGET)-ar
+    else
     CC ?= gcc
-    CXX ?= g++
     AR ?= ar
+    endif
     PNG_OUTDIR = $(shell find $(OUT_DIR)/.. -name 'png-sys-*' -type d)
     CFLAGS += -fPIC -I$(PNG_OUTDIR)

ProTip! Use n and p to navigate between commits in a pull request.

You can’t perform that action at this time.