You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
50 lines
1.6 KiB
50 lines
1.6 KiB
Index: Makefile |
|
--- Makefile.orig 2017-06-16 06:20:14.000000000 +0200 |
|
+++ Makefile 2017-06-16 08:53:32.898076000 +0200 |
|
@@ -218,12 +218,7 @@ |
|
|
|
libraries: $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) |
|
|
|
-# No point in building dylib for ios |
|
-ifneq (ios, $(OS)) |
|
-libraries: $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIX) |
|
-endif |
|
- |
|
-LIBRARIES += $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) $(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXFULLVER) |
|
+LIBRARIES += $(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX) |
|
|
|
$(LIBPREFIX)$(PROJECT_NAME).$(LIBSUFFIX): $(ENCODER_OBJS) $(DECODER_OBJS) $(PROCESSING_OBJS) $(COMMON_OBJS) |
|
$(QUIET)rm -f $@ |
|
@@ -312,7 +307,7 @@ |
|
install -m 644 $(EXTRA_LIBRARY) $(DESTDIR)$(PREFIX)/$(LIBDIR_NAME) |
|
endif |
|
|
|
-install: install-static-lib install-shared |
|
+install: install-static |
|
@: |
|
|
|
ifneq ($(HAVE_GTEST),Yes) |
|
Index: codec/common/generate_version.sh |
|
--- codec/common/generate_version.sh.orig 2017-06-16 06:20:14.000000000 +0200 |
|
+++ codec/common/generate_version.sh 2017-06-16 08:52:20.709399000 +0200 |
|
@@ -1,19 +1,6 @@ |
|
#!/bin/bash |
|
-git rev-list HEAD | sort > config.git-hash |
|
SRC_PATH=$1 |
|
-LOCALVER=`wc -l config.git-hash | awk '{print $1}'` |
|
-if [ $LOCALVER \> 1 ] ; then |
|
- VER="$(git rev-list HEAD -n 1 | cut -c 1-7)" |
|
- if git status | grep -q "modified:" ; then |
|
- VER="${VER}+M" |
|
- fi |
|
- GIT_VERSION=$VER |
|
-else |
|
- GIT_VERSION= |
|
- VER="x" |
|
-fi |
|
-GIT_VERSION='"'$GIT_VERSION'"' |
|
-rm -f config.git-hash |
|
+GIT_VERSION='"'0000'"' |
|
|
|
mkdir -p codec/common/inc |
|
cat $SRC_PATH/codec/common/inc/version_gen.h.template | sed "s/\$FULL_VERSION/$GIT_VERSION/g" > codec/common/inc/version_gen.h.new
|
|
|