Improve Cargo build.

Also adds support for Android.
servo · Sep 4, 2014 · f4c036d · f4c036d
1 parent 9967910
commit f4c036d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,6 @@
 [package]
-
 name = "stb_image"
 version = "0.1.0"
 authors = ["The Servo Project Developers"]
 
-build = "./build.sh"
+build = "make -f makefile.cargo"
diff --git a/build.sh b/build.sh
diff --git a/makefile.cargo b/makefile.cargo
@@ -0,0 +1,22 @@
+ifeq (androideabi,$(findstring androideabi,$(TARGET)))
+
+CC := $(TARGET)-gcc
+AR := $(TARGET)-ar
+
+else
+
+CC ?= gcc
+AR ?= ar
+
+endif
+
+CFLAGS += -fPIC
+
+.PHONY: all
+all: $(OUT_DIR)/libstb-image.a
+
+$(OUT_DIR)/stb_image.o: src/stb_image.c
+	$(CC) $< -o $@ -c $(CFLAGS)
+
+$(OUT_DIR)/libstb-image.a: $(OUT_DIR)/stb_image.o
+	$(AR) rcs $@ $^