fix compile error

This commit is contained in:
gozfree
2020-03-14 19:59:29 +08:00
parent 14bf3b33b4
commit 56e0685f84
39 changed files with 60 additions and 39 deletions
+14 -13
View File
@@ -1,7 +1,7 @@
###############################################################################
# common
###############################################################################
#ARCH: linux/pi/android/ios/
#ARCH: linux/arm/android/ios/win
ARCH ?= linux
CROSS_PREFIX ?=
OUTPUT ?= /usr/local
@@ -13,7 +13,6 @@ ifeq ($(ARCH_INC), $(wildcard $(ARCH_INC)))
include $(ARCH_INC)
endif
CC = $(CROSS_PREFIX)gcc
CXX = $(CROSS_PREFIX)g++
LD = $(CROSS_PREFIX)ld
@@ -62,7 +61,7 @@ else
OUTLIBPATH := $(OUTPUT)/$(LTYPE)
endif
CFLAGS += $($(ARCH)_CFLAGS)
CFLAGS += -Iinclude
CFLAGS += -I./include
CFLAGS += -I$(OUTPUT)/include
CFLAGS += -DNO_CRYPTO
@@ -91,7 +90,7 @@ $(TGT_LIB_A): $(OBJS_LIB)
$(AR_V) rcs $@ $^
$(TGT_LIB_SO): $(OBJS_LIB)
$(LD_V) -o $@ $^ $(SHARED)
$(CC_V) -o $@ $^ $(SHARED)
@mv $(TGT_LIB_SO) $(TGT_LIB_SO_VER)
@ln -sf $(TGT_LIB_SO_VER) $(TGT_LIB_SO)
@@ -105,14 +104,16 @@ clean:
install:
$(MAKEDIR_OUTPUT)
if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
$(CP_V) -r $(TGT_LIB_H) $(OUTPUT)/include
$(CP_V) -r $(TGT_LIB_A) $(OUTLIBPATH)/lib
$(CP_V) -r $(TGT_LIB_SO) $(OUTLIBPATH)/lib
$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTLIBPATH)/lib
@if [ "$(MODE)" = "release" ];then $(STRIP) $(TGT); fi
@mkdir -p ${OUTPUT}/include/gear-lib
@mkdir -p ${OUTPUT}/lib/gear-lib
$(CP_V) -r include/$(TGT_LIB_H) $(OUTPUT)/include/gear-lib
$(CP_V) -r $(TGT_LIB_A) $(OUTLIBPATH)/lib/gear-lib
$(CP_V) -r $(TGT_LIB_SO) $(OUTLIBPATH)/lib/gear-lib
$(CP_V) -r $(TGT_LIB_SO_VER) $(OUTLIBPATH)/lib/gear-lib
uninstall:
cd $(OUTPUT)/include/ && rm -f $(TGT_LIB_H)
$(RM_V) -f $(OUTLIBPATH)/lib/$(TGT_LIB_A)
$(RM_V) -f $(OUTLIBPATH)/lib/$(TGT_LIB_SO)
$(RM_V) -f $(OUTLIBPATH)/lib/$(TGT_LIB_SO_VER)
cd $(OUTPUT)/include/gear-lib && rm -f $(TGT_LIB_H)
$(RM_V) -f $(OUTLIBPATH)/lib/gear-lib/$(TGT_LIB_A)
$(RM_V) -f $(OUTLIBPATH)/lib/gear-lib/$(TGT_LIB_SO)
$(RM_V) -f $(OUTLIBPATH)/lib/gear-lib/$(TGT_LIB_SO_VER)
+12
View File
@@ -109,6 +109,17 @@ check_output()
fi
}
check_install()
{
if [ ! -d "/usr/local/include/gear-lib" ]; then
mkdir -p /usr/local/include/gear-lib
fi
if [ ! -d "/usr/local/lib/gear-lib" ]; then
mkdir -p /usr/local/lib/gear-lib
fi
}
install_dep()
{
return
@@ -195,6 +206,7 @@ do_build()
"dep")
install_dep;;
"install")
check_install
build_all install;;
"uninstall")
build_all uninstall;;
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/amf.h
../gear-lib/librtmpc/amf.h
+1
View File
@@ -0,0 +1 @@
../gear-lib/libmedia-io/audio-def.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/bytes.h
../gear-lib/librtmpc/bytes.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/cencode.h
../gear-lib/librtmpc/cencode.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/dh.h
../gear-lib/librtmpc/dh.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/dhgroups.h
../gear-lib/librtmpc/dhgroups.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/handshake.h
../gear-lib/librtmpc/handshake.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/http.h
../gear-lib/librtmpc/http.h
+1
View File
@@ -0,0 +1 @@
../gear-lib/libhomekit/libhomekit.h
+1
View File
@@ -0,0 +1 @@
../gear-lib/libosal/libosal.h
-1
View File
@@ -1 +0,0 @@
../gear-lib/librtmp/librtmp.h
+1
View File
@@ -0,0 +1 @@
../gear-lib/librtmpc/librtmpc.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/log.h
../gear-lib/librtmpc/log.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/md5.h
../gear-lib/librtmpc/md5.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp.h
../gear-lib/librtmpc/rtmp.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_aac.h
../gear-lib/librtmpc/rtmp_aac.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_g711.h
../gear-lib/librtmpc/rtmp_g711.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_h264.h
../gear-lib/librtmpc/rtmp_h264.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_sys.h
../gear-lib/librtmpc/rtmp_sys.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_util.h
../gear-lib/librtmpc/rtmp_util.h
+1
View File
@@ -0,0 +1 @@
../gear-lib/librtmpc/version.h
+1
View File
@@ -0,0 +1 @@
../gear-lib/libmedia-io/video-def.h
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/amf.c
../gear-lib/librtmpc/amf.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/hashswf.c
../gear-lib/librtmpc/hashswf.c
+1
View File
@@ -0,0 +1 @@
../gear-lib/libdarray/libdarray.c
+1
View File
@@ -0,0 +1 @@
../gear-lib/libhomekit/libhomekit.c
+1
View File
@@ -0,0 +1 @@
../gear-lib/libosal/libosal.c
-1
View File
@@ -1 +0,0 @@
../gear-lib/librtmp/librtmp.c
+1
View File
@@ -0,0 +1 @@
../gear-lib/librtmpc/librtmpc.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/log.c
../gear-lib/librtmpc/log.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/parseurl.c
../gear-lib/librtmpc/parseurl.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp.c
../gear-lib/librtmpc/rtmp.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_aac.c
../gear-lib/librtmpc/rtmp_aac.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_g711.c
../gear-lib/librtmpc/rtmp_g711.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_h264.c
../gear-lib/librtmpc/rtmp_h264.c
+1 -1
View File
@@ -1 +1 @@
../gear-lib/librtmp/rtmp_util.c
../gear-lib/librtmpc/rtmp_util.c