Remove redefinition of preprocessor macros, minor fixes and prepare f…

…or version 0.1.15
OlehKulykov · Sep 1, 2015 · 777a163 · 777a163
1 parent 6b513c9
commit 777a163
Show file tree

Hide file tree

Showing 24 changed files with 2,099 additions and 1,241 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/FayeCpp.podspec b/FayeCpp.podspec
@@ -2,10 +2,10 @@ Pod::Spec.new do |s|
 
 # Common settings
   s.name         = "FayeCpp"
-  s.version      = "0.1.14"
-  s.summary      = "Faye C++ client with Objective-C client wrapper."
+  s.version      = "0.1.15"
+  s.summary      = "Faye C++ lightweight, cross-platform client with Objective-C client wrapper."
   s.description  = <<-DESC
-Faye C++ client with Objective-C client wrapper. 
+Faye C++ lightweight, cross-platform client with Objective-C client wrapper. 
 Library created with Pure C++ (features provided by Standard C++), without heavy STL and C++11 features.
 You can use Objective-C wrapper or C++ client directly.
                       DESC
@@ -47,7 +47,7 @@ You can use Objective-C wrapper or C++ client directly.
     'libwebsockets/lib/alloc.c'
 
   s.resources = 'contrib/objc/FayeCpp.bundle'
-  s.compiler_flags = '-DHAVE_FAYECPP_CONFIG_H=1', '-DHAVE_CONFIG_H=1', '-DCMAKE_BUILD=1', '-DHAVE_COREFOUNDATION_FRAMEWORK=1'
+  s.compiler_flags = '-DHAVE_FAYECPP_CONFIG_H=1', '-DHAVE_CONFIG_H=1', '-DCMAKE_BUILD=1', '-DRE_HAVE_COREFOUNDATION_FRAMEWORK=1'
   s.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/FayeCpp/contrib/objc" "${PODS_ROOT}/FayeCpp/libwebsockets/lib" "${PODS_ROOT}/FayeCpp/jansson/src"' }
   s.libraries    = 'z', 'stdc++'
   s.framework = 'CoreFoundation'

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 0.1.14.{build}
+version: 0.1.15.{build}
 
 # branches to build
 branches: