diff --git a/Example/Classes/UnrarExampleViewController.mm b/Example/Classes/UnrarExampleViewController.m similarity index 100% rename from Example/Classes/UnrarExampleViewController.mm rename to Example/Classes/UnrarExampleViewController.m diff --git a/Example/UnrarExample.xcodeproj/project.pbxproj b/Example/UnrarExample.xcodeproj/project.pbxproj index ccb8b11..534f10a 100755 --- a/Example/UnrarExample.xcodeproj/project.pbxproj +++ b/Example/UnrarExample.xcodeproj/project.pbxproj @@ -14,7 +14,7 @@ 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; 2899E5220DE3E06400AC0155 /* UnrarExampleViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2899E5210DE3E06400AC0155 /* UnrarExampleViewController.xib */; }; 28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; }; - 28D7ACF80DDB3853001CB0EB /* UnrarExampleViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.mm */; }; + 28D7ACF80DDB3853001CB0EB /* UnrarExampleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.m */; }; 480F6005128A0C0B00A9B478 /* not_protected.cbr in Resources */ = {isa = PBXBuildFile; fileRef = 480F6002128A0C0B00A9B478 /* not_protected.cbr */; }; 48BB62E31621B98300B424E2 /* protected.cbr in Resources */ = {isa = PBXBuildFile; fileRef = 48BB62E21621B98300B424E2 /* protected.cbr */; }; 96BBCACF18DE82D900BE9B86 /* libUnrarKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 96BBCACE18DE82D900BE9B86 /* libUnrarKit.a */; }; @@ -31,7 +31,7 @@ 2899E5210DE3E06400AC0155 /* UnrarExampleViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UnrarExampleViewController.xib; sourceTree = ""; }; 28AD733E0D9D9553002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = ""; }; 28D7ACF60DDB3853001CB0EB /* UnrarExampleViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnrarExampleViewController.h; sourceTree = ""; }; - 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = UnrarExampleViewController.mm; sourceTree = ""; }; + 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UnrarExampleViewController.m; sourceTree = ""; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* UnrarExample_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnrarExample_Prefix.pch; sourceTree = ""; }; 480F6002128A0C0B00A9B478 /* not_protected.cbr */ = {isa = PBXFileReference; lastKnownFileType = file; path = not_protected.cbr; sourceTree = ""; }; @@ -62,7 +62,7 @@ 1D3623240D0F684500981E51 /* UnrarExampleAppDelegate.h */, 1D3623250D0F684500981E51 /* UnrarExampleAppDelegate.m */, 28D7ACF60DDB3853001CB0EB /* UnrarExampleViewController.h */, - 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.mm */, + 28D7ACF70DDB3853001CB0EB /* UnrarExampleViewController.m */, ); path = Classes; sourceTree = ""; @@ -189,7 +189,7 @@ files = ( 1D60589B0D05DD56006BFB54 /* main.m in Sources */, 1D3623260D0F684500981E51 /* UnrarExampleAppDelegate.m in Sources */, - 28D7ACF80DDB3853001CB0EB /* UnrarExampleViewController.mm in Sources */, + 28D7ACF80DDB3853001CB0EB /* UnrarExampleViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -246,6 +246,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 3.0; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; + OTHER_LDFLAGS = "-lc++"; PREBINDING = NO; SDKROOT = iphoneos; }; @@ -259,6 +260,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 3.0; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + OTHER_LDFLAGS = "-lc++"; PREBINDING = NO; SDKROOT = iphoneos; }; diff --git a/README.md b/README.md index e0b7f72..bb0fb06 100644 --- a/README.md +++ b/README.md @@ -20,8 +20,6 @@ I've included a sample [`podfile`](Example/Podfile) in the Example directory alo # Notes -Since UnrarKit uses C++ libraries, you will need to change the extension of classes that use UnrarKit to `.mm`. This will include `libstdc++` in the linking stage. If you would like to keep your extension `.m` (though I'm not sure what the advantage would be), you will need to add `libstdc++` to the linker flags in your application. - To open in Xcode, use the [UnrarKit.xcworkspace](UnrarKit.xcworkspace) file, which includes the other projects. # Credits diff --git a/Resources/UnrarKit-Info.plist b/Resources/UnrarKit-Info.plist index ba8ecd3..9de2d6d 100644 --- a/Resources/UnrarKit-Info.plist +++ b/Resources/UnrarKit-Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 2.2.3 + 2.2.4 CFBundleSignature ???? CFBundleVersion - 2.2.3 + 2.2.4 diff --git a/UnrarKit.podspec b/UnrarKit.podspec index 3a7d0cf..99aeca5 100644 --- a/UnrarKit.podspec +++ b/UnrarKit.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "UnrarKit" - s.version = "2.2.3" + s.version = "2.2.4" s.summary = "A port of the UnRAR library for the iOS and Mac platforms" s.license = "BSD" s.homepage = "https://github.com/abbeycode/UnrarKit" @@ -87,6 +87,7 @@ Pod::Spec.new do |s| "Libraries/unrar/unpackinline.cpp", "Libraries/unrar/uowners.cpp", "Libraries/unrar/win32stm.cpp" - s.xcconfig = { "OTHER_CFLAGS" => "$(inherited) -Wno-return-type -Wno-logical-op-parentheses -Wno-conversion -Wno-parentheses -Wno-unused-function -Wno-unused-variable -Wno-switch", + s.xcconfig = { "OTHER_LDFLAGS" => "$(inherited) -lc++", + "OTHER_CFLAGS" => "$(inherited) -Wno-return-type -Wno-logical-op-parentheses -Wno-conversion -Wno-parentheses -Wno-unused-function -Wno-unused-variable -Wno-switch", "OTHER_CPLUSPLUSFLAGS" => "$(inherited) -DSILENT -DRARDLL $(OTHER_CFLAGS)" } end