diff --git a/UIDemo/KSYLiveUIDemo/Info.plist b/UIDemo/KSYLiveUIDemo/Info.plist index ce80e8c..ea019ec 100644 --- a/UIDemo/KSYLiveUIDemo/Info.plist +++ b/UIDemo/KSYLiveUIDemo/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.3 + 3.0.4 CFBundleVersion - 3.0.3.1 + 3.0.4.0 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/demo/KSYLiveDemo-dy-framework.xcconfig b/demo/KSYLiveDemo-dy-framework.xcconfig index e31eb4e..ec1c388 100644 --- a/demo/KSYLiveDemo-dy-framework.xcconfig +++ b/demo/KSYLiveDemo-dy-framework.xcconfig @@ -1,4 +1,4 @@ OTHER_CFLAGS = -I../framework/ -OTHER_LDFLAGS = $(inherited) -ObjC -all_load -framework libksygpulive -framework GPUImage -framework Bugly -framework YYImage -lstdc++.6 -lz -lZipArchive -L../framework/ +OTHER_LDFLAGS = $(inherited) -ObjC -all_load -framework libksygpulive -framework GPUImage -framework Bugly -framework YYImage -lc++ -lz -lZipArchive -L../framework/ IPHONEOS_DEPLOYMENT_TARGET = 8.0 FRAMEWORK_SEARCH_PATHS = $(inherited) ../framework/ ../framework/dynamic diff --git a/demo/KSYLiveDemo-framework.xcconfig b/demo/KSYLiveDemo-framework.xcconfig index b52d04c..d176aae 100644 --- a/demo/KSYLiveDemo-framework.xcconfig +++ b/demo/KSYLiveDemo-framework.xcconfig @@ -1,3 +1,3 @@ OTHER_CFLAGS = -I../framework/ -OTHER_LDFLAGS = $(inherited) -ObjC -all_load -framework libksygpulive -framework GPUImage -framework Bugly -framework YYImage -lstdc++.6 -lz -lZipArchive -L../framework/ +OTHER_LDFLAGS = $(inherited) -ObjC -all_load -framework libksygpulive -framework GPUImage -framework Bugly -framework YYImage -lc++ -lz -lZipArchive -L../framework/ FRAMEWORK_SEARCH_PATHS = $(inherited) ../framework/ ../framework/static diff --git a/demo/KSYLiveDemo/Info.plist b/demo/KSYLiveDemo/Info.plist index 222bdef..247f6fe 100644 --- a/demo/KSYLiveDemo/Info.plist +++ b/demo/KSYLiveDemo/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.0.3 + 3.0.4 CFBundleSignature ???? CFBundleVersion - 3.0.3.1 + 3.0.4.0 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/doc/docset-installed.txt b/doc/docset-installed.txt index 3b1d46f..2f595cd 100644 --- a/doc/docset-installed.txt +++ b/doc/docset-installed.txt @@ -1,4 +1,4 @@ Documentation set was installed to Xcode! Path: /Users/ksvc/Library/Developer/Shared/Documentation/DocSets/com.ksyun.KSYLive_iOS.docset -Time: 2018-04-23 06:41:49 +0000 \ No newline at end of file +Time: 2018-07-12 03:00:36 +0000 \ No newline at end of file diff --git a/doc/docset/Contents/Resources/docSet.dsidx b/doc/docset/Contents/Resources/docSet.dsidx index 8f26f9d..f803ec5 100644 Binary files a/doc/docset/Contents/Resources/docSet.dsidx and b/doc/docset/Contents/Resources/docSet.dsidx differ diff --git a/doc/docset/Contents/Resources/docSet.dsidx-shm b/doc/docset/Contents/Resources/docSet.dsidx-shm index 4765266..79dd409 100644 Binary files a/doc/docset/Contents/Resources/docSet.dsidx-shm and b/doc/docset/Contents/Resources/docSet.dsidx-shm differ diff --git a/doc/docset/Contents/Resources/docSet.dsidx-wal b/doc/docset/Contents/Resources/docSet.dsidx-wal index d66af95..af71174 100644 Binary files a/doc/docset/Contents/Resources/docSet.dsidx-wal and b/doc/docset/Contents/Resources/docSet.dsidx-wal differ diff --git a/doc/docset/Contents/Resources/docSet.skidx b/doc/docset/Contents/Resources/docSet.skidx index 127ffe1..1df5d2d 100644 Binary files a/doc/docset/Contents/Resources/docSet.skidx and b/doc/docset/Contents/Resources/docSet.skidx differ diff --git a/doc/docset/Contents/Resources/docSet.toc b/doc/docset/Contents/Resources/docSet.toc index df09263..1dbc392 100644 Binary files a/doc/docset/Contents/Resources/docSet.toc and b/doc/docset/Contents/Resources/docSet.toc differ diff --git a/doc/docset/Contents/Resources/docSet.tokencache b/doc/docset/Contents/Resources/docSet.tokencache index f34140c..586d7e8 100644 Binary files a/doc/docset/Contents/Resources/docSet.tokencache and b/doc/docset/Contents/Resources/docSet.tokencache differ diff --git a/libksygpulive.podspec b/libksygpulive.podspec index e8d8df4..ce87cbe 100644 --- a/libksygpulive.podspec +++ b/libksygpulive.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'libksygpulive' - s.version = '3.0.3' + s.version = '3.0.4' s.license = { :type => 'Proprietary', :text => <<-LICENSE @@ -15,7 +15,7 @@ Pod::Spec.new do |s| * libksygpulive lite/265 capture video, compress and publish stream to rtmp server DESC s.platform = :ios, '7.0' - s.ios.library = 'z', 'iconv', 'stdc++.6', 'bz2' + s.ios.library = 'z', 'iconv', 'c++', 'bz2' s.ios.frameworks = [ 'AVFoundation', 'VideoToolbox'] s.ios.deployment_target = '7.0' s.source = { diff --git a/prebuilt/include/KSYStreamerBase/libksystreamerbase.h b/prebuilt/include/KSYStreamerBase/libksystreamerbase.h index 7ca8caa..5b5aef4 100644 --- a/prebuilt/include/KSYStreamerBase/libksystreamerbase.h +++ b/prebuilt/include/KSYStreamerBase/libksystreamerbase.h @@ -14,5 +14,5 @@ #import "KSYMessage.h" #import "KSYTranscoder.h" -#define KSYSTREAMERBASE_VER 3.0.3 -#define KSYSTREAMERBASE_ID 14b123968721cf0cd1da80f47eb868ee987e6f0f +#define KSYSTREAMERBASE_VER 3.0.4 +#define KSYSTREAMERBASE_ID 1cb92e3f9ef6d159ee8c579339a4d7d81cb1c5da diff --git a/prebuilt/libs/libksybase.a b/prebuilt/libs/libksybase.a index f749404..3c7d340 100644 Binary files a/prebuilt/libs/libksybase.a and b/prebuilt/libs/libksybase.a differ diff --git a/prebuilt/libs/libksymediacodec.a b/prebuilt/libs/libksymediacodec.a index 2bf2beb..495a104 100644 Binary files a/prebuilt/libs/libksymediacodec.a and b/prebuilt/libs/libksymediacodec.a differ diff --git a/prebuilt/libs/libksymediacore_dec_lite.a b/prebuilt/libs/libksymediacore_dec_lite.a index 48b49ca..43dfddc 100644 Binary files a/prebuilt/libs/libksymediacore_dec_lite.a and b/prebuilt/libs/libksymediacore_dec_lite.a differ diff --git a/prebuilt/libs/libksymediacore_dec_vod.a b/prebuilt/libs/libksymediacore_dec_vod.a index c7ae1df..3947f58 100644 Binary files a/prebuilt/libs/libksymediacore_dec_vod.a and b/prebuilt/libs/libksymediacore_dec_vod.a differ diff --git a/prebuilt/libs/libksymediacore_enc_265.a b/prebuilt/libs/libksymediacore_enc_265.a index c3fea17..68802b3 100644 Binary files a/prebuilt/libs/libksymediacore_enc_265.a and b/prebuilt/libs/libksymediacore_enc_265.a differ diff --git a/prebuilt/libs/libksymediacore_enc_base.a b/prebuilt/libs/libksymediacore_enc_base.a index a8f5e2c..009dfbf 100644 Binary files a/prebuilt/libs/libksymediacore_enc_base.a and b/prebuilt/libs/libksymediacore_enc_base.a differ diff --git a/prebuilt/libs/libksymediacore_enc_lite.a b/prebuilt/libs/libksymediacore_enc_lite.a index 6d3780f..0e23391 100644 Binary files a/prebuilt/libs/libksymediacore_enc_lite.a and b/prebuilt/libs/libksymediacore_enc_lite.a differ diff --git a/prebuilt/libs/libksyplayer.a b/prebuilt/libs/libksyplayer.a index 17225b0..f35165a 100644 Binary files a/prebuilt/libs/libksyplayer.a and b/prebuilt/libs/libksyplayer.a differ diff --git a/prebuilt/libs/libksystreamerbase.a b/prebuilt/libs/libksystreamerbase.a index 9ab0bf1..1581b73 100644 Binary files a/prebuilt/libs/libksystreamerbase.a and b/prebuilt/libs/libksystreamerbase.a differ diff --git a/prebuilt/libs/libksyyuv.a b/prebuilt/libs/libksyyuv.a index 0ab6b3c..1982757 100644 Binary files a/prebuilt/libs/libksyyuv.a and b/prebuilt/libs/libksyyuv.a differ diff --git a/releaseFramework/release-libKSYLive.sh b/releaseFramework/release-libKSYLive.sh index 0b80abf..c387427 100755 --- a/releaseFramework/release-libKSYLive.sh +++ b/releaseFramework/release-libKSYLive.sh @@ -114,7 +114,7 @@ LIVE_DEPS="${LIVE_DEPS} -lksymediacore_enc -lksymediacore_enc_base" LIVE_DEPS_DEV="${LIVE_DEPS} -lksymediacodec" LIVE_DEPS_SIM="${LIVE_DEPS}" -LD_FLAGS="-all_load -lstdc++.6 -lz" +LD_FLAGS="-all_load -lc++ -lz" LIB_FLAGS="" if [ $FRAMEWORKNAME == "KSYMediaPlayer" ]; then LIB_FLAGS_DEV="${LIB_FLAGS} ${PLAYER_DEPS}"