Linux Fixes (#5)

* created include folder for the public interface

* fixed include

* moved forward declaration of GAState to GACommon.h

* updated header

* fixes for linux

* proper include path

* catch parsing errors

* separate public and private libs, add public interface to source

Author: dorin-ga

CMakeLists.txt

@@ -53,6 +53,9 @@ FILE(GLOB_RECURSE CPP_SOURCES
     "${GA_SOURCE_DIR}/gameanalytics/*.h"
     "${GA_SOURCE_DIR}/gameanalytics/*.cpp"
 
+    "${INCLUDE_DIR}/*.h"
+    "${INCLUDE_DIR}/*.cpp"
+
     # Add dependencies
     "${DEPENDENCIES_DIR}/crossguid/*"
     "${DEPENDENCIES_DIR}/nlohmann/*"
@@ -67,12 +70,14 @@ FILE(GLOB_RECURSE CPP_SOURCES
 create_source_groups(CPP_SOURCES)
 
 if(${GA_USE_PACKAGE})
+
     find_package(CURL REQUIRED PATHS ${EXTERNALS_DIR}/curl)
     find_package(OpenSSL REQUIRED PATHS ${EXTERNALS_DIR}/openssl)
     set(LIBS CURL::libcurl)
+
 else()
-    add_definitions("-DUSE_OPENSSL -DCURL_STATICLIB")
-    add_definitions("-DCRYPTOPP_DISABLE_ASM")
+
+    add_definitions("-DUSE_OPENSSL -DCURL_STATICLIB -DCRYPTOPP_DISABLE_ASM")
 
     link_directories(
         "${EXTERNALS_DIR}/openssl/1.1.1d/libs/${PLATFORM}"
@@ -113,7 +118,7 @@ elseif(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGUID_CFUUID")
     FILE(GLOB_RECURSE MACOS_SOURCES "${GA_SOURCE_DIR}/gameanalytics/Platform/*.mm")
     list(APPEND CPP_SOURCES ${MACOS_SOURCES})
-    list(APPEND LIBS
+    set(PUBLIC_LIBS
         "-framework CoreFoundation"
         "-framework Foundation"
         "-framework CoreServices"
@@ -131,4 +136,4 @@ if(${GA_BUILD_SAMPLE})
 endif()
 
 add_library(GameAnalytics ${LIB_TYPE} ${CPP_SOURCES})
-target_link_libraries(GameAnalytics ${LIBS})
+target_link_libraries(GameAnalytics PRIVATE ${LIBS} PUBLIC ${PUBLIC_LIBS})

README.md

@@ -85,7 +85,7 @@ Usage of the SDK
 Remember to include the GameAnalytics header file wherever you are using the SDK:
 
 ``` c++
- #include "GameAnalytics.h"
+ #include "GameAnalytics/GameAnalytics.h"
 ```
 
 ### Custom log handler

source/gameanalytics/GAUtilities.h

@@ -79,7 +79,15 @@ namespace gameanalytics
 
         inline json parseFields(std::string const& fields)
         {
-            return fields.empty() ? json() : json::parse(fields);
+            try
+            {
+                return fields.empty() ? json() : json::parse(fields);
+            }
+            catch(const std::exception& e)
+            {
+                (void)e;
+                return json();
+            }
         }
 
         inline std::int64_t getTimestamp()
@@ -134,7 +142,6 @@ namespace gameanalytics
                 }
                 catch(const std::exception& e)
                 {
-                    //logging::GALogger::d("Error with ws2s: %S", wstr.c_str());
                     return "";
                 }
             }
@@ -147,7 +154,6 @@ namespace gameanalytics
                 }
                 catch(const std::exception& e)
                 {
-                    //logging::GALogger::d("Error with s2ws: %s", str.c_str());
                     return L"";
                 }
             }

source/gameanalytics/Platform/GALinux.cpp

@@ -2,6 +2,8 @@
 
 #if IS_LINUX
 
+#include "GAState.h"
+
 #include <execinfo.h>
 #include <sys/sysctl.h>
 #include <sys/utsname.h>
@@ -172,25 +174,25 @@ void gameanalytics::GAPlatformLinux::signalHandler(int sig, siginfo_t* info, voi
     }
 }
 
-std::string gameanalytics::GAPlatformMacOS::getCpuModel() const
+std::string gameanalytics::GAPlatformLinux::getCpuModel() const
 {
     struct utsname systemInfo;
     uname(&systemInfo);
 
     return systemInfo.machine;
 }
 
-std::string gameanalytics::GAPlatformMacOS::getGpuModel() const 
+std::string gameanalytics::GAPlatformLinux::getGpuModel() const 
 {
     return UNKNOWN_VALUE;
 }
 
-int gameanalytics::GAPlatformMacOS::getNumCpuCores() const
+int gameanalytics::GAPlatformLinux::getNumCpuCores() const
 {
     return (int)sysconf(_SC_NPROCESSORS_ONLN);
 }
 
-int64_t gameanalytics::GAPlatformMacOS::getTotalDeviceMemory() const 
+int64_t gameanalytics::GAPlatformLinux::getTotalDeviceMemory() const 
 {
     struct sysinfo info = {};
     if(sysinfo(&info) == 0)
@@ -258,5 +260,4 @@ int64_t gameanalytics::GAPlatformLinux::getBootTime() const
     return currentTime.tv_sec - startTime.tv_sec;
 }
 
-
 #endif