From 329ccba38f1c5abb9d346e26fa31f32505190dfc Mon Sep 17 00:00:00 2001 From: jo-codegirl Date: Mon, 11 Sep 2023 08:20:48 -0600 Subject: [PATCH 1/2] Fix for android compiler error in websockets --- CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a2e489c..f64e0832 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -576,6 +576,8 @@ if (USE_LIBWEBSOCKETS) target_compile_options(mbedtls PRIVATE -Wno-unused-but-set-variable) target_compile_options(mbedcrypto PRIVATE -Wno-unused-but-set-variable) endif() + elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + target_compile_options(websockets PRIVATE -Wno-typedef-redefinition) endif() list(APPEND libs websockets) From bd8d7455a64f4e768b1a48ee5a3d2af37ea72921 Mon Sep 17 00:00:00 2001 From: jo-codegirl Date: Thu, 14 Sep 2023 13:16:44 -0600 Subject: [PATCH 2/2] FIX to user_header_search_paths in podspec for cocopods release, updating version for patch --- BrainCloudCpp.podspec | 11 +++++++---- lib/jsoncpp-1.0.0 | 2 +- src/BrainCloudClient.cpp | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/BrainCloudCpp.podspec b/BrainCloudCpp.podspec index 38fb87c3..6046afe1 100644 --- a/BrainCloudCpp.podspec +++ b/BrainCloudCpp.podspec @@ -11,7 +11,7 @@ Pod::Spec.new do |s| s.name = "BrainCloudCpp" - s.version = "5.0.0" + s.version = "5.0.1" s.summary = "The C++ client library for brainCloud" s.homepage = "http://getbraincloud.com/" @@ -41,9 +41,12 @@ Pod::Spec.new do |s| s.source_files = "src/*.{c,cpp}", "src/apple/*.{c,cpp,mm}", "include/braincloud/*.h", "include/braincloud/internal/*.h", "include/braincloud/internal/apple/*.h" s.exclude_files = "src/DefaultSaveDataHelper.cpp", "src/DefaultGUID.cpp" , "src/DefaultFileUploader.cpp", "src/DefaultWebSocket.cpp", "src/DefaultPinger.cpp" - # hack for use_frameworks! + # for use_frameworks! + # to use development pod: change below to your full source code path + # to use cocoapod release: change to be relative to ${PODS_ROOT} s.xcconfig = { - 'USER_HEADER_SEARCH_PATHS' => '"${SRCROOT}/include/"' + # eg. 'USER_HEADER_SEARCH_PATHS' => '"/local/path/to/braincloud-cpp/include"' + 'USER_HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/BrainCloudCpp/include"' } # ――― Project Linking ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # @@ -51,7 +54,7 @@ Pod::Spec.new do |s| s.libraries = 'c++', 'z' s.osx.framework = 'LDAP' s.dependency 'SSKeychain' - s.dependency 'BrainCloudJsonCpp', '~>1.1.4' + s.dependency 'BrainCloudJsonCpp', '~>1.2' s.ios.dependency 'SocketRocket', '~> 0.5' s.osx.dependency 'SocketRocket', '~> 0.5' #s.watchos.dependency 'SocketRocket', '~> 0.5' diff --git a/lib/jsoncpp-1.0.0 b/lib/jsoncpp-1.0.0 index 93648148..d63d046c 160000 --- a/lib/jsoncpp-1.0.0 +++ b/lib/jsoncpp-1.0.0 @@ -1 +1 @@ -Subproject commit 936481487006f630abe9e40e63dab4e3acdc1def +Subproject commit d63d046ca8c684e2aa5c17d337c8fb014916e5f1 diff --git a/src/BrainCloudClient.cpp b/src/BrainCloudClient.cpp index 8a8bbb22..8736d23a 100644 --- a/src/BrainCloudClient.cpp +++ b/src/BrainCloudClient.cpp @@ -27,7 +27,7 @@ namespace BrainCloud "Singleton usage is disabled. If called by mistake, use your own variable that holds an instance of the bcWrapper/bcClient."; BrainCloudClient * BrainCloudClient::_instance = NULL; - std::string BrainCloudClient::s_brainCloudClientVersion = "5.0.0"; + std::string BrainCloudClient::s_brainCloudClientVersion = "5.0.1"; const char* BC_SERVER_URL = "https://api.braincloudservers.com/dispatcherv2"; /**