diff options
| author | Xavi Artigas <xartigas@fluendo.com> | 2012-11-12 14:12:16 +0100 |
|---|---|---|
| committer | Xavi Artigas <xartigas@fluendo.com> | 2012-11-12 14:12:16 +0100 |
| commit | c0a9e805b6f26d703e88ae7d2859e111dbdea879 (patch) | |
| tree | 6ecc1bf440fae763b883ed8ae3c1269aeb187e38 /data | |
| parent | 3512642194ed9d8c96135515e7cff0e093db78d1 (diff) | |
Fix build on windows
Diffstat (limited to 'data')
| -rwxr-xr-x | data/ndk-build/gstreamer.mk | 9 | ||||
| -rw-r--r-- | data/ndk-build/tools.mk | 10 |
2 files changed, 7 insertions, 12 deletions
diff --git a/data/ndk-build/gstreamer.mk b/data/ndk-build/gstreamer.mk index aad7dd6..0dcb290 100755 --- a/data/ndk-build/gstreamer.mk +++ b/data/ndk-build/gstreamer.mk @@ -54,15 +54,6 @@ ifeq ($(HOST_OS),windows) else endif -################################# -# Make pkg-config relocatable # -################################# -#pkg-config: -# set PKG_CONFIG_LIBDIR and override the prefix and libdir variables -PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig pkg-config -PKG_CONFIG := $(PKG_CONFIG_ORIG) --define-variable=prefix=$(GSTREAMER_SDK_ROOT) --define-variable=libdir=$(GSTREAMER_SDK_ROOT)/lib - - GSTREAMER_ANDROID_MODULE_NAME := gstreamer_android GSTREAMER_BUILD_DIR := gst-build GSTREAMER_ANDROID_O := $(GSTREAMER_BUILD_DIR)/$(GSTREAMER_ANDROID_MODULE_NAME).o diff --git a/data/ndk-build/tools.mk b/data/ndk-build/tools.mk index aac7673..65ac13d 100644 --- a/data/ndk-build/tools.mk +++ b/data/ndk-build/tools.mk @@ -20,14 +20,18 @@ # pkg-config # ################ # Host tools +# Make pkg-config relocatable +# set PKG_CONFIG_LIBDIR and override the prefix and libdir variables ifeq ($(HOST_OS),windows) HOST_PKG_CONFIG := $(GSTREAMER_NDK_BUILD_PATH)/tools/windows/pkg-config + # No space before the &&, or it will be added to PKG_CONFIG_LIBDIR + PKG_CONFIG_ORIG := set PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig&& $(HOST_PKG_CONFIG) + GSTREAMER_SDK_ROOT := $(subst \,/,$(GSTREAMER_SDK_ROOT)) else HOST_PKG_CONFIG := pkg-config + PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig $(HOST_PKG_CONFIG) endif -# Make pkg-config relocatable -# set PKG_CONFIG_LIBDIR and override the prefix and libdir variables -PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig pkg-config + PKG_CONFIG := $(PKG_CONFIG_ORIG) --define-variable=prefix=$(GSTREAMER_SDK_ROOT) --define-variable=libdir=$(GSTREAMER_SDK_ROOT)/lib # ----------------------------------------------------------------------------- |