From bcbe71de2b7c33b03ee5e78a595b1328e9f04227 Mon Sep 17 00:00:00 2001 From: TYPCN Date: Sun, 6 Sep 2015 19:34:50 +0800 Subject: [PATCH] Change libaria2 to aria2c --- .gitattributes | 1 + bilibili.xcodeproj/project.pbxproj | 8 ++++---- bilibili/Others/{AppDelegate.mm => AppDelegate.m} | 2 -- bilibili/libs/aria2c | 3 +++ bilibili/libs/libaria2.0.dylib | 3 --- 5 files changed, 8 insertions(+), 9 deletions(-) rename bilibili/Others/{AppDelegate.mm => AppDelegate.m} (99%) create mode 100755 bilibili/libs/aria2c delete mode 100755 bilibili/libs/libaria2.0.dylib diff --git a/.gitattributes b/.gitattributes index 2aad1a0..5f0750e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.dylib filter=lfs diff=lfs merge=lfs -crlf bilibili/libs/*.dylib filter=lfs diff=lfs merge=lfs -text +bilibili/libs/aria2c filter=lfs diff=lfs merge=lfs -text diff --git a/bilibili.xcodeproj/project.pbxproj b/bilibili.xcodeproj/project.pbxproj index 603e648..fee417b 100644 --- a/bilibili.xcodeproj/project.pbxproj +++ b/bilibili.xcodeproj/project.pbxproj @@ -25,7 +25,7 @@ FD1954C71B25942F003A958F /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = FD1954C61B25942F003A958F /* main.m */; }; FD1954CA1B259447003A958F /* AboutView.m in Sources */ = {isa = PBXBuildFile; fileRef = FD1954C91B259447003A958F /* AboutView.m */; }; FD1954CD1B259457003A958F /* ISSoundAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = FD1954CC1B259457003A958F /* ISSoundAdditions.m */; }; - FD1954D01B259462003A958F /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = FD1954CF1B259462003A958F /* AppDelegate.mm */; }; + FD1954D01B259462003A958F /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = FD1954CF1B259462003A958F /* AppDelegate.m */; }; FD1954D31B25947A003A958F /* playLocalFile.m in Sources */ = {isa = PBXBuildFile; fileRef = FD1954D21B25947A003A958F /* playLocalFile.m */; }; FD1954EB1B2594AC003A958F /* AssClass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1954D71B2594AC003A958F /* AssClass.cpp */; }; FD1954ED1B2594AC003A958F /* danmaku2ass.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FD1954DA1B2594AC003A958F /* danmaku2ass.cpp */; }; @@ -281,7 +281,7 @@ FD1954CB1B259457003A958F /* ISSoundAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ISSoundAdditions.h; path = Others/ISSoundAdditions.h; sourceTree = ""; }; FD1954CC1B259457003A958F /* ISSoundAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ISSoundAdditions.m; path = Others/ISSoundAdditions.m; sourceTree = ""; }; FD1954CE1B259462003A958F /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Others/AppDelegate.h; sourceTree = ""; }; - FD1954CF1B259462003A958F /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = Others/AppDelegate.mm; sourceTree = ""; }; + FD1954CF1B259462003A958F /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Others/AppDelegate.m; sourceTree = ""; }; FD1954D11B25947A003A958F /* playLocalFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = playLocalFile.h; path = PlayerView/playLocalFile.h; sourceTree = ""; }; FD1954D21B25947A003A958F /* playLocalFile.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = playLocalFile.m; path = PlayerView/playLocalFile.m; sourceTree = ""; }; FD1954D71B2594AC003A958F /* AssClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AssClass.cpp; sourceTree = ""; }; @@ -474,7 +474,7 @@ FD8CEDEC1AD249540092452F /* Settings View */, FD476C6C1AD22A2000584EFE /* Others */, FD1954CE1B259462003A958F /* AppDelegate.h */, - FD1954CF1B259462003A958F /* AppDelegate.mm */, + FD1954CF1B259462003A958F /* AppDelegate.m */, FD4855071AE67AD8008F49AA /* gencache.sh */, FD076C531AC8CBBB00C893FA /* Supporting Files */, FD36B0D01B995A2C00FB32CC /* Common.hpp */, @@ -999,7 +999,7 @@ FD1954B61B259330003A958F /* PostComment.m in Sources */, FD1954C51B259368003A958F /* Socket.cpp in Sources */, FD1954CD1B259457003A958F /* ISSoundAdditions.m in Sources */, - FD1954D01B259462003A958F /* AppDelegate.mm in Sources */, + FD1954D01B259462003A958F /* AppDelegate.m in Sources */, FD5B0C621B9ABAFF00045F10 /* TWebView.mm in Sources */, FD1954BC1B259342003A958F /* downloadWrapper.mm in Sources */, FD36B0B71B98920A00FB32CC /* WebTabView.mm in Sources */, diff --git a/bilibili/Others/AppDelegate.mm b/bilibili/Others/AppDelegate.m similarity index 99% rename from bilibili/Others/AppDelegate.mm rename to bilibili/Others/AppDelegate.m index 4b31c82..3e678b1 100644 --- a/bilibili/Others/AppDelegate.mm +++ b/bilibili/Others/AppDelegate.m @@ -7,7 +7,6 @@ // #import "AppDelegate.h" -#include "aria2.hpp" Browser *browser; @@ -60,7 +59,6 @@ - (void)applicationWillFinishLaunching:(NSNotification *)notification { } - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - aria2::libraryInit(); NSUserDefaults *s = [NSUserDefaults standardUserDefaults]; NSString *uuid = [s objectForKey:@"UUID"]; if(!uuid){ diff --git a/bilibili/libs/aria2c b/bilibili/libs/aria2c new file mode 100755 index 0000000..feadfcb --- /dev/null +++ b/bilibili/libs/aria2c @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3649fbe44d98c65dc8e5017bd321c5386e197ddf34c50d5afd6923d6ab6e4ed +size 3472032 diff --git a/bilibili/libs/libaria2.0.dylib b/bilibili/libs/libaria2.0.dylib deleted file mode 100755 index 407ac7b..0000000 --- a/bilibili/libs/libaria2.0.dylib +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:63c5fbf0ca070b84ff54c7f3c2b3251b10c845e489d794aa02bd92433b014d4f -size 2992476