Fixed build failure in Xamarin C# project (#3032)

remotes/origin/clang-format
sauwming 2 years ago committed by GitHub
parent 0297a3bf57
commit 7231318c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -227,7 +227,7 @@ typedef enum pjmedia_format_id
PJMEDIA_FORMAT_MPEG2VIDEO = PJMEDIA_FORMAT_PACK('M', 'P', '2', 'V'),
PJMEDIA_FORMAT_MPEG4 = PJMEDIA_FORMAT_PACK('M', 'P', 'G', '4'),
PJMEDIA_FORMAT_INVALID = 0xFFFFFFFF
PJMEDIA_FORMAT_INVALID = 0xFFFFFFF
} pjmedia_format_id;

@ -46,6 +46,8 @@ $(LIBPJSUA2): $(OUT_DIR)/pjsua2_wrap.o
ifeq ($(OS),android)
$(PJ_CXX) -shared -o $(LIBPJSUA2) $(OUT_DIR)/pjsua2_wrap.o \
$(MY_CFLAGS) $(MY_LDFLAGS)
# copy libc++_shared.so manually
cp -f ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${TARGET_ARCH}/libc++_shared.so $(LIBPJSUA2_DIR)
endif
ifeq ($(OS),ios)
$(AR) $(LIBPJSUA2) $(AR_FLAGS) $(OUT_DIR)/pjsua2_wrap.o $(PJ_LIBXX_FILES)

@ -464,7 +464,7 @@ typedef enum pjmedia_format_id
PJMEDIA_FORMAT_MPEG1VIDEO = ((('V' << 24) | ('1' << 16)) | ('P' << 8)) | 'M',
PJMEDIA_FORMAT_MPEG2VIDEO = ((('V' << 24) | ('2' << 16)) | ('P' << 8)) | 'M',
PJMEDIA_FORMAT_MPEG4 = ((('4' << 24) | ('G' << 16)) | ('P' << 8)) | 'M',
PJMEDIA_FORMAT_INVALID = 0xFFFFFFFF
PJMEDIA_FORMAT_INVALID = 0xFFFFFFF
} pjmedia_format_id;
typedef enum pjmedia_vid_packing

Loading…
Cancel
Save