Update to latest mercurial snapshot.
This commit is contained in:
parent
bdb2560967
commit
d87bf10db4
6 changed files with 96 additions and 33 deletions
|
|
@ -1,6 +1,6 @@
|
|||
--- Makefile.orig 2016-02-05 14:41:31.862198725 -0700
|
||||
+++ Makefile 2016-02-04 21:46:14.618379630 -0700
|
||||
@@ -46,7 +46,7 @@ ARCHFLAGS := $(ARCHFLAGS)
|
||||
--- Makefile.orig 2018-02-01 20:02:43.820439769 -0700
|
||||
+++ Makefile 2018-02-01 20:05:02.079115011 -0700
|
||||
@@ -47,7 +47,7 @@ ARCHFLAGS := $(ARCHFLAGS)
|
||||
|
||||
OPTFLAGS ?= -g -O
|
||||
|
||||
|
|
@ -9,16 +9,14 @@
|
|||
ifneq ($(findstring arm,$(shell uname -m)),)
|
||||
CFLAGS += -DABC_MEMALIGN=4
|
||||
endif
|
||||
@@ -186,6 +186,12 @@ $(PROG): $(OBJ)
|
||||
@echo "$(MSG_PREFIX)\`\` Building binary:" $(notdir $@)
|
||||
$(VERBOSE)$(LD) -o $@ $^ $(LIBS)
|
||||
@@ -200,7 +200,9 @@ lib$(PROG).a: $(LIBOBJ)
|
||||
|
||||
+lib$(PROG).so: $(OBJ)
|
||||
+ @echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
|
||||
+ $(VERBOSE)$(LD) -shared -Wl,-h,lib$(PROG).so.0 -o lib$(PROG).so.0.0.0 $^ $(LIBS)
|
||||
lib$(PROG).so: $(LIBOBJ)
|
||||
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
|
||||
- $(VERBOSE)$(CXX) -shared -o $@ $^ $(LIBS)
|
||||
+ $(VERBOSE)$(CXX) -shared -Wl,-h,lib$(PROG).so.0 -o lib$(PROG).so.0.0.0 $^ $(LIBS)
|
||||
+ $(VERBOSE)ln -s lib$(PROG).so.0.0.0 lib$(PROG).so.0
|
||||
+ $(VERBOSE)ln -s lib$(PROG).so.0 $@
|
||||
+
|
||||
lib$(PROG).a: $(OBJ)
|
||||
@echo "$(MSG_PREFIX)\`\` Linking:" $(notdir $@)
|
||||
$(VERBOSE)ar rv $@ $?
|
||||
|
||||
docs:
|
||||
@echo "$(MSG_PREFIX)\`\` Building documentation." $(notdir $@)
|
||||
|
|
|
|||
Reference in a new issue