Created
October 24, 2012 13:52
-
-
Save theuni/3946168 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tools/android/depends/Makefile.include.in b/tools/android/depends/Makefile.include.in | |
index a209546..67e4022 100644 | |
--- a/tools/android/depends/Makefile.include.in | |
+++ b/tools/android/depends/Makefile.include.in | |
@@ -70,6 +70,7 @@ ifneq ($(NATIVE_BUILD),1) | |
export ACLOCAL_PATH=$(PREFIX)/share/aclocal:$(NATIVEPREFIX)/share/aclocal | |
export LIBTOOLIZE=$(NATIVEPREFIX)/bin/libtoolize | |
export AUTORECONF=$(NATIVEPREFIX)/bin/autoreconf | |
+ export CMAKE=$(NATIVEPREFIX)/bin/cmake | |
else | |
PLATFORM=$(NATIVEPLATFORM) | |
PREFIX=$(NATIVEPREFIX) | |
diff --git a/tools/android/depends/libplist/Makefile b/tools/android/depends/libplist/Makefile | |
index 104f51c..83283ed 100644 | |
--- a/tools/android/depends/libplist/Makefile | |
+++ b/tools/android/depends/libplist/Makefile | |
@@ -23,7 +23,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) | |
cd $(PLATFORM); patch -p0 < ../0002-missing-libs.patch | |
cd $(PLATFORM); patch -p0 < ../0003-no-so-version.patch | |
cd $(PLATFORM); rm -rf build; mkdir -p build | |
- cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) cmake \ | |
+ cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) $(CMAKE) \ | |
-DCMAKE_C_FLAGS:STRING="$(CPPFLAGS) $(CFLAGS)" \ | |
-DCMAKE_CXX_FLAGS:STRING="$(CPPFLAGS) $(CXXFLAGS)" \ | |
-DCMAKE_INCLUDE_PATH=$(PREFIX)/include \ | |
diff --git a/tools/android/depends/libssh/Makefile b/tools/android/depends/libssh/Makefile | |
index 8848ef3..9951428 100644 | |
--- a/tools/android/depends/libssh/Makefile | |
+++ b/tools/android/depends/libssh/Makefile | |
@@ -23,7 +23,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) | |
cd $(PLATFORM); patch -p0 < ../md5.patch | |
sed -ie "s|-fstack-protector|-fnostack-protector|" "$(PLATFORM)/cmake/Modules/DefineCompilerFlags.cmake" | |
sed -ie "s|add_subdirectory(examples)||" "$(PLATFORM)/CMakeLists.txt" | |
- cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) cmake \ | |
+ cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) $(CMAKE) \ | |
-DCMAKE_C_FLAGS:STRING="$(CPPFLAGS) $(CFLAGS)" \ | |
-DCMAKE_CXX_FLAGS:STRING="$(CPPFLAGS) $(CXXFLAGS)" \ | |
-DCMAKE_INSTALL_NAME_DIR=$(PREFIX)/lib \ | |
diff --git a/tools/android/depends/taglib/Makefile b/tools/android/depends/taglib/Makefile | |
index 6508df1..1978111 100644 | |
--- a/tools/android/depends/taglib/Makefile | |
+++ b/tools/android/depends/taglib/Makefile | |
@@ -16,7 +16,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) | |
rm -rf $(PLATFORM); mkdir -p $(PLATFORM) | |
$(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) | |
cd $(PLATFORM); rm -rf build; mkdir -p build | |
- cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) cmake \ | |
+ cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) $(CMAKE) \ | |
-DENABLE_STATIC=1 \ | |
-DCMAKE_C_FLAGS:STRING="$(CPPFLAGS) $(CFLAGS)" \ | |
-DCMAKE_CXX_FLAGS:STRING="$(CPPFLAGS) $(CXXFLAGS)" \ | |
diff --git a/tools/android/depends/yajl/Makefile b/tools/android/depends/yajl/Makefile | |
index 03965dc..f02761e 100644 | |
--- a/tools/android/depends/yajl/Makefile | |
+++ b/tools/android/depends/yajl/Makefile | |
@@ -6,7 +6,6 @@ LIBNAME=yajl | |
VERSION=2.0.1 | |
SOURCE=lloyd-$(LIBNAME)-f4b2b1a | |
ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz | |
-CMAKE=$(PREFIX)/bin/cmake | |
# configuration settings | |
LIBDYLIB=$(PLATFORM)/build/$(LIBNAME)-$(VERSION)/lib/libyajl.a | |
@@ -27,7 +26,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) | |
cd $(PLATFORM); patch -p0 < ../static.patch | |
cd $(PLATFORM); patch -p0 < ../shared.patch | |
cd $(PLATFORM); rm -rf build; mkdir -p build | |
- cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) cmake \ | |
+ cd $(PLATFORM)/build; CC=$(CC) CXX=$(CXX) $(CMAKE) \ | |
-DCMAKE_C_FLAGS:STRING="$(CPPFLAGS) $(CFLAGS)" \ | |
-DCMAKE_CXX_FLAGS:STRING="$(CPPFLAGS) $(CXXFLAGS)" \ | |
-DCMAKE_INCLUDE_PATH=$(PREFIX)/include |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment