1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00

Merge from SRS2

This commit is contained in:
winlin 2018-10-28 14:24:18 +08:00
commit 39f1629168
3 changed files with 19 additions and 0 deletions

View file

@ -0,0 +1,13 @@
--- Makefile 2018-10-28 13:49:27.000000000 +0800
+++ ../st-1.9-patch/Makefile 2018-10-28 13:50:07.000000000 +0800
@@ -139,8 +139,8 @@ CFLAGS += -arch ppc
LDFLAGS += -arch ppc
endif
ifeq ($(INTEL), yes)
-CFLAGS += -arch i386 -arch x86_64
-LDFLAGS += -arch i386 -arch x86_64
+CFLAGS += -arch x86_64
+LDFLAGS += -arch x86_64
endif
LDFLAGS += -dynamiclib -install_name /sw/lib/libst.$(MAJOR).$(DSO_SUFFIX) -compatibility_version $(MAJOR) -current_version $(VERSION)
OTHER_FLAGS = -Wall