diff options
Diffstat (limited to 'data/ndk-build')
| -rwxr-xr-x | data/ndk-build/gstreamer-1.0.mk | 18 | ||||
| -rwxr-xr-x | data/ndk-build/gstreamer.mk | 18 | ||||
| -rw-r--r-- | data/ndk-build/tools.mk | 14 |
3 files changed, 25 insertions, 25 deletions
diff --git a/data/ndk-build/gstreamer-1.0.mk b/data/ndk-build/gstreamer-1.0.mk index 4746a878..dd5a2c49 100755 --- a/data/ndk-build/gstreamer-1.0.mk +++ b/data/ndk-build/gstreamer-1.0.mk @@ -16,9 +16,9 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -$(call assert-defined, GSTREAMER_SDK_ROOT) -$(if $(wildcard $(GSTREAMER_SDK_ROOT)),,\ - $(error "The directory GSTREAMER_SDK_ROOT=$(GSTREAMER_SDK_ROOT) does not exists")\ +$(call assert-defined, GSTREAMER_ROOT) +$(if $(wildcard $(GSTREAMER_ROOT)),,\ + $(error "The directory GSTREAMER_ROOT=$(GSTREAMER_ROOT) does not exists")\ ) @@ -34,18 +34,18 @@ endif ifndef GSTREAMER_STATIC_PLUGINS_PATH GSTREAMER_STATIC_PLUGINS_PATH := lib/gstreamer-1.0 endif -GSTREAMER_STATIC_PLUGINS_PATH := $(GSTREAMER_SDK_ROOT)/lib/gstreamer-1.0/static +GSTREAMER_STATIC_PLUGINS_PATH := $(GSTREAMER_ROOT)/lib/gstreamer-1.0/static # Path for the NDK integration makefiles ifndef GSTREAMER_NDK_BUILD_PATH -GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_SDK_ROOT)/share/gst-android/ndk-build +GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build endif # Include tools include $(GSTREAMER_NDK_BUILD_PATH)/tools.mk # Path for the static GIO modules -G_IO_MODULES_PATH := $(GSTREAMER_SDK_ROOT)/lib/gio/modules/static +G_IO_MODULES_PATH := $(GSTREAMER_ROOT)/lib/gio/modules/static # Host tools ifeq ($(HOST_OS),windows) @@ -84,7 +84,7 @@ LOCAL_MAKEFILE := $(local-makefile) LOCAL_PREBUILT_PREFIX := lib LOCAL_PREBUILT_SUFFIX := .so LOCAL_EXPORT_C_INCLUDES := $(subst -I$1, $1, $(call pkg-config-get-includes,$(GSTREAMER_DEPS))) -LOCAL_EXPORT_C_INCLUDES += $(GSTREAMER_SDK_ROOT)/include +LOCAL_EXPORT_C_INCLUDES += $(GSTREAMER_ROOT)/include ################################################################## @@ -139,7 +139,7 @@ GSTREAMER_ANDROID_LIBS += $(GSTREAMER_PLUGINS_LIBS) $(G_IO_MODULES_LIBS) - GSTREAMER_ANDROID_WHOLE_AR := $(call pkg-config-get-libs-no-deps,$(GSTREAMER_DEPS)) # Fix deps for giognutls GSTREAMER_ANDROID_LIBS := $(call fix-deps,-lgiognutls, -lhogweed) -GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS)) -I$(GSTREAMER_SDK_ROOT)/include +GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS)) -I$(GSTREAMER_ROOT)/include # In newer NDK, SYSROOT is replaced by SYSROOT_INC and SYSROOT_LINK, which # now points to the root directory. But this will probably change in the future from: @@ -151,7 +151,7 @@ endif # Create the link command GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(TARGET_LDFLAGS) -shared --sysroot=$(SYSROOT) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ - -L$(GSTREAMER_SDK_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) $(G_IO_MODULES_PATH) \ + -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) $(G_IO_MODULES_PATH) \ $(GSTREAMER_ANDROID_LIBS), $(GSTREAMER_LD)) -Wl,-no-undefined $(GSTREAMER_LD) GSTREAMER_ANDROID_CMD := $(call libtool-whole-archive,$(GSTREAMER_ANDROID_CMD),$(GSTREAMER_ANDROID_WHOLE_AR)) diff --git a/data/ndk-build/gstreamer.mk b/data/ndk-build/gstreamer.mk index 16a040b0..88fb3a1c 100755 --- a/data/ndk-build/gstreamer.mk +++ b/data/ndk-build/gstreamer.mk @@ -16,9 +16,9 @@ # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -$(call assert-defined, GSTREAMER_SDK_ROOT) -$(if $(wildcard $(GSTREAMER_SDK_ROOT)),,\ - $(error "The directory GSTREAMER_SDK_ROOT=$(GSTREAMER_SDK_ROOT) does not exists")\ +$(call assert-defined, GSTREAMER_ROOT) +$(if $(wildcard $(GSTREAMER_ROOT)),,\ + $(error "The directory GSTREAMER_ROOT=$(GSTREAMER_ROOT) does not exists")\ ) @@ -34,18 +34,18 @@ endif ifndef GSTREAMER_STATIC_PLUGINS_PATH GSTREAMER_STATIC_PLUGINS_PATH := lib/gstreamer-0.10 endif -GSTREAMER_STATIC_PLUGINS_PATH := $(GSTREAMER_SDK_ROOT)/lib/gstreamer-0.10/static +GSTREAMER_STATIC_PLUGINS_PATH := $(GSTREAMER_ROOT)/lib/gstreamer-0.10/static # Path for the NDK integration makefiles ifndef GSTREAMER_NDK_BUILD_PATH -GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_SDK_ROOT)/share/gst-android/ndk-build +GSTREAMER_NDK_BUILD_PATH := $(GSTREAMER_ROOT)/share/gst-android/ndk-build endif # Include tools include $(GSTREAMER_NDK_BUILD_PATH)/tools.mk # Path for the static GIO modules -G_IO_MODULES_PATH := $(GSTREAMER_SDK_ROOT)/lib/gio/modules/static +G_IO_MODULES_PATH := $(GSTREAMER_ROOT)/lib/gio/modules/static # Host tools ifeq ($(HOST_OS),windows) @@ -84,7 +84,7 @@ LOCAL_MAKEFILE := $(local-makefile) LOCAL_PREBUILT_PREFIX := lib LOCAL_PREBUILT_SUFFIX := .so LOCAL_EXPORT_C_INCLUDES := $(subst -I$1, $1, $(call pkg-config-get-includes,$(GSTREAMER_DEPS))) -LOCAL_EXPORT_C_INCLUDES += $(GSTREAMER_SDK_ROOT)/include +LOCAL_EXPORT_C_INCLUDES += $(GSTREAMER_ROOT)/include ################################################################## @@ -142,7 +142,7 @@ GSTREAMER_ANDROID_LIBS += $(GSTREAMER_PLUGINS_LIBS) $(G_IO_MODULES_LIBS) - GSTREAMER_ANDROID_WHOLE_AR := $(call pkg-config-get-libs-no-deps,$(GSTREAMER_DEPS)) # Fix deps for giognutls GSTREAMER_ANDROID_LIBS := $(call fix-deps,-lgiognutls, -lhogweed) -GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS)) -I$(GSTREAMER_SDK_ROOT)/include +GSTREAMER_ANDROID_CFLAGS := $(call pkg-config-get-includes,$(GSTREAMER_DEPS)) -I$(GSTREAMER_ROOT)/include # In newer NDK, SYSROOT is replaced by SYSROOT_INC and SYSROOT_LINK, which # now points to the root directory. But this will probably change in the future from: @@ -154,7 +154,7 @@ endif # Create the link command GSTREAMER_ANDROID_CMD := $(call libtool-link,$(TARGET_CC) $(TARGET_LDFLAGS) -shared --sysroot=$(SYSROOT) \ -o $(GSTREAMER_ANDROID_SO) $(GSTREAMER_ANDROID_O) \ - -L$(GSTREAMER_SDK_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) $(G_IO_MODULES_PATH) \ + -L$(GSTREAMER_ROOT)/lib -L$(GSTREAMER_STATIC_PLUGINS_PATH) $(G_IO_MODULES_PATH) \ $(GSTREAMER_ANDROID_LIBS), $(GSTREAMER_LD)) -Wl,-no-undefined $(GSTREAMER_LD) GSTREAMER_ANDROID_CMD := $(call libtool-whole-archive,$(GSTREAMER_ANDROID_CMD),$(GSTREAMER_ANDROID_WHOLE_AR)) diff --git a/data/ndk-build/tools.mk b/data/ndk-build/tools.mk index 65ac13d4..1e22a96b 100644 --- a/data/ndk-build/tools.mk +++ b/data/ndk-build/tools.mk @@ -25,14 +25,14 @@ 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)) + PKG_CONFIG_ORIG := set PKG_CONFIG_LIBDIR=$(GSTREAMER_ROOT)/lib/pkgconfig&& $(HOST_PKG_CONFIG) + GSTREAMER_ROOT := $(subst \,/,$(GSTREAMER_ROOT)) else HOST_PKG_CONFIG := pkg-config - PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_SDK_ROOT)/lib/pkgconfig $(HOST_PKG_CONFIG) + PKG_CONFIG_ORIG := PKG_CONFIG_LIBDIR=$(GSTREAMER_ROOT)/lib/pkgconfig $(HOST_PKG_CONFIG) endif -PKG_CONFIG := $(PKG_CONFIG_ORIG) --define-variable=prefix=$(GSTREAMER_SDK_ROOT) --define-variable=libdir=$(GSTREAMER_SDK_ROOT)/lib +PKG_CONFIG := $(PKG_CONFIG_ORIG) --define-variable=prefix=$(GSTREAMER_ROOT) --define-variable=libdir=$(GSTREAMER_ROOT)/lib # ----------------------------------------------------------------------------- # Function : pkg-config-get-includes @@ -61,7 +61,7 @@ pkg-config-get-libs = \ pkg-config-get-libs-no-deps = \ $(eval __tmpvar.libs := ) \ $(foreach package,$1,\ - $(eval __tmpvar.libs += $(shell $(HOST_SED) -n 's/^Libs: \(.*\)/\1/p' $(GSTREAMER_SDK_ROOT)/lib/pkgconfig/$(package).pc)))\ + $(eval __tmpvar.libs += $(shell $(HOST_SED) -n 's/^Libs: \(.*\)/\1/p' $(GSTREAMER_ROOT)/lib/pkgconfig/$(package).pc)))\ $(filter -l%, $(__tmpvar.libs)) # ----------------------------------------------------------------------------- @@ -71,7 +71,7 @@ pkg-config-get-libs-no-deps = \ # Usage : $(call pkg-config-get-prefix,<package>) # ----------------------------------------------------------------------------- pkg-config-get-prefix = \ - $(shell $(HOST_SED) -n 's/^prefix=\(.*\)/\1/p' $(GSTREAMER_SDK_ROOT)/lib/pkgconfig/$1.pc) + $(shell $(HOST_SED) -n 's/^prefix=\(.*\)/\1/p' $(GSTREAMER_ROOT)/lib/pkgconfig/$1.pc) # ----------------------------------------------------------------------------- # Function : libtool-whole-archive @@ -266,7 +266,7 @@ libtool-get-dependency-libs = \ $(shell $(HOST_SED) -n "s/^dependency_libs='\(.*\)'/\1/p" $1) libtool-replace-prefixes = \ - $(subst $(BUILD_PREFIX),$(GSTREAMER_SDK_ROOT),$1 ) + $(subst $(BUILD_PREFIX),$(GSTREAMER_ROOT),$1 ) libtool-get-static-library = \ $(shell $(HOST_SED) -n "s/^old_library='\(.*\)'/\1/p" $1) |