Skip to content
Snippets Groups Projects
Commit c14f4b28 authored by Richard van der Hoff's avatar Richard van der Hoff
Browse files
parents c0c307c0 b2b93d7a
No related branches found
No related tags found
No related merge requests found
...@@ -17,45 +17,46 @@ Pod::Spec.new do |s| ...@@ -17,45 +17,46 @@ Pod::Spec.new do |s|
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" } s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
s.authors = { "Chris Ballinger" => "chrisballinger@gmail.com", s.authors = { "Chris Ballinger" => "chrisballinger@gmail.com",
"matrix.org" => "support@matrix.org" } "matrix.org" => "support@matrix.org" }
s.platform = :ios, "5.0" s.ios.deployment_target = "5.0"
s.osx.deployment_target = "10.9"
# Expose the Objective-C wrapper API of libolm # Expose the Objective-C wrapper API of libolm
s.public_header_files = "xcode/OLMKit/*.h" s.public_header_files = "xcode/OLMKit/*.h"
s.source = { s.source = {
:git => "https://matrix.org/git/olm.git", :git => "https://matrix.org/git/olm.git",
:tag => s.version.to_s :tag => s.version.to_s
} }
s.source_files = "xcode/OLMKit/*.{h,m}", "include/**/*.{h,hh}", "src/*.{c,cpp}", "lib/crypto-algorithms/sha256.c", "lib/crypto-algorithms/aes.c", "lib/curve25519-donna/curve25519-donna.c" s.source_files = "xcode/OLMKit/*.{h,m}", "include/**/*.{h,hh}", "src/*.{c,cpp}", "lib/crypto-algorithms/sha256.c", "lib/crypto-algorithms/aes.c", "lib/curve25519-donna/curve25519-donna.c"
# Those files (including .c) are included by ed25519.c. We do not want to compile them twice # Those files (including .c) are included by ed25519.c. We do not want to compile them twice
s.preserve_paths = "lib/ed25519/**/*.{h,c}" s.preserve_paths = "lib/ed25519/**/*.{h,c}"
s.library = "c++" s.library = "c++"
# Use the same compiler options for C and C++ as olm/Makefile # Use the same compiler options for C and C++ as olm/Makefile
s.compiler_flags = "-g -O3 -DOLMLIB_VERSION_MAJOR=#{MAJOR} -DOLMLIB_VERSION_MINOR=#{MINOR} -DOLMLIB_VERSION_PATCH=#{PATCH}" s.compiler_flags = "-g -O3 -DOLMLIB_VERSION_MAJOR=#{MAJOR} -DOLMLIB_VERSION_MINOR=#{MINOR} -DOLMLIB_VERSION_PATCH=#{PATCH}"
# For headers search paths, manage first the normal installation. Then, use paths used # For headers search paths, manage first the normal installation. Then, use paths used
# when the pod is local # when the pod is local
s.xcconfig = { s.xcconfig = {
'USER_HEADER_SEARCH_PATHS' =>"${PODS_ROOT}/OLMKit/include ${PODS_ROOT}/OLMKit/lib #{File.join(File.dirname(__FILE__), 'include')} #{File.join(File.dirname(__FILE__), 'lib')}" 'USER_HEADER_SEARCH_PATHS' =>"${PODS_ROOT}/OLMKit/include ${PODS_ROOT}/OLMKit/lib #{File.join(File.dirname(__FILE__), 'include')} #{File.join(File.dirname(__FILE__), 'lib')}"
} }
s.subspec 'olmc' do |olmc| s.subspec 'olmc' do |olmc|
olmc.source_files = "src/*.{c}", "lib/curve25519-donna.h", "lib/crypto-algorithms/sha256.{h,c}", "lib/crypto-algorithms/aes.{h,c}", "lib/curve25519-donna/curve25519-donna.c" olmc.source_files = "src/*.{c}", "lib/curve25519-donna.h", "lib/crypto-algorithms/sha256.{h,c}", "lib/crypto-algorithms/aes.{h,c}", "lib/curve25519-donna/curve25519-donna.c"
olmc.compiler_flags = ' -std=c99 -fPIC' olmc.compiler_flags = ' -std=c99 -fPIC'
end end
s.subspec 'olmcpp' do |olmcpp| s.subspec 'olmcpp' do |olmcpp|
olmcpp.source_files = "src/*.{cpp}" olmcpp.source_files = "src/*.{cpp}"
olmcpp.compiler_flags = ' -std=c++11 -fPIC' olmcpp.compiler_flags = ' -std=c++11 -fPIC'
end end
end end
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
limitations under the License. limitations under the License.
*/ */
#import <UIKit/UIKit.h> #import <Foundation/Foundation.h>
//! Project version string for OLMKit, the same as libolm. //! Project version string for OLMKit, the same as libolm.
NSString *OLMKitVersionString(); NSString *OLMKitVersionString();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment