Fixes for Win64

sheldonrobinson · Sep 28, 2019 · cda2af8 · cda2af8
1 parent 5160974
commit cda2af8
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 21 deletions.
diff --git a/Source/ThirdParty/XInfoLibrary/Win64/xinfo.dll b/Source/ThirdParty/XInfoLibrary/Win64/xinfo.dll
diff --git a/Source/ThirdParty/XInfoLibrary/Win64/xinfo.lib b/Source/ThirdParty/XInfoLibrary/Win64/xinfo.lib
diff --git a/Source/ThirdParty/XInfoLibrary/include/m4gfx/sis/summary_manager.hpp b/Source/ThirdParty/XInfoLibrary/include/m4gfx/sis/summary_manager.hpp
@@ -26,7 +26,7 @@ class XINFO_API summary_manager
 
     static void Release();
 
-    XINFO_API const x_info& GetSystemInformationSummary(){
+    const x_info& GetSystemInformationSummary(){
         if(RunOnce){
             setup();
             RunOnce = false;

diff --git a/Source/ThirdParty/XInfoLibrary/include/m4gfx/sis/x_info.hpp b/Source/ThirdParty/XInfoLibrary/include/m4gfx/sis/x_info.hpp
@@ -49,33 +49,33 @@ class XINFO_API x_info
         return *this;
     }
 
-    XINFO_API  const std::string& get_id() const { return _tag; }
+    const std::string& get_id() const { return _tag; }
 
-    XINFO_API  const m4gfx::XINFOCLASS get_type() const { return _type; }
+    const m4gfx::XINFOCLASS get_type() const { return _type; }
 
-    XINFO_API  void set_type(m4gfx::XINFOCLASS t ) { _type = t; }
+    void set_type(m4gfx::XINFOCLASS t ) { _type = t; }
 
-    XINFO_API  const void add_attribute(std::string attr){
+    const void add_attribute(std::string attr){
         _attrs.insert(attr);
     }
 
-    XINFO_API  const void add_attribute(const std::set<std::string>& attrs) {
+    const void add_attribute(const std::set<std::string>& attrs) {
 	_attrs.insert(attrs.cbegin(), attrs.cend());
     }
 
-    XINFO_API   const void insert_json(const rapidjson::Document& d);
+    const void insert_json(const rapidjson::Document& d);
 
-    XINFO_API  const void insert_info(const std::string info_path, const x_info&  data);
+    const void insert_info(const std::string info_path, const x_info&  data);
 
-    XINFO_API  const rapidjson::Document& get_data() const {
+    const rapidjson::Document& get_data() const {
         return xis_info;
     }
 
-    XINFO_API  const std::set<std::string> get_fields() const  {
+    const std::set<std::string> get_fields() const  {
 	return _attrs;
     }
 
-    XINFO_API  const std::string get_data_as_string() const {
+    const std::string get_data_as_string() const {
     	rapidjson::StringBuffer buffer;
     	rapidjson::Writer<rapidjson::StringBuffer> writer(buffer);
     	xis_info.Accept(writer);

diff --git a/Source/ThirdParty/XInfoLibrary/include/xinfo/xinfo_api.h b/Source/ThirdParty/XInfoLibrary/include/xinfo/xinfo_api.h
@@ -10,11 +10,21 @@
 #else
 #  ifndef XINFO_TEMPLATE_API
 #    ifdef XINFO_EXPORTS
-        /* We are building this library */
-#      define XINFO_TEMPLATE_API __attribute__((visibility("default")))
+#		ifdef _MSC_VER
+			/* We are building this library */
+#      		define XINFO_TEMPLATE_API __declspec(dllexport)
+#		else
+			/* We are building this library */
+#      		define XINFO_TEMPLATE_API __attribute__((visibility("default")))
+#		endif
 #    else
-        /* We are using this library */
-#      define XINFO_TEMPLATE_API __attribute__((visibility("default")))
+#		ifdef _MSC_VER
+			/* We are using this library */
+#			define XINFO_TEMPLATE_API __declspec(dllimport)
+#		else
+			/* We are using this library */
+#      		define XINFO_TEMPLATE_API __attribute__((visibility("default")))
+#		endif
 #    endif
 #  endif
 

diff --git a/Source/ThirdParty/XInfoLibrary/include/xinfo/xinfo_export.h b/Source/ThirdParty/XInfoLibrary/include/xinfo/xinfo_export.h
@@ -9,21 +9,39 @@
 #else
 #  ifndef XINFO_API
 #    ifdef xinfo_EXPORTS
-        /* We are building this library */
-#      define XINFO_API __attribute__((visibility("default")))
+#		ifdef _MSC_VER
+			/* We are building this library */
+#			define XINFO_API __declspec(dllexport)
+#		else
+			/* We are building this library */
+#			define XINFO_API __attribute__((visibility("default")))
+#		endif
 #    else
-        /* We are using this library */
-#      define XINFO_API __attribute__((visibility("default")))
+#		ifdef _MSC_VER
+			/* We are using this library */
+#			define XINFO_API __declspec(dllimport)
+#		else
+			/* We are using this library */
+#			define XINFO_API __attribute__((visibility("default")))
+#		endif
 #    endif
 #  endif
 
 #  ifndef XINFO_NO_EXPORT
-#    define XINFO_NO_EXPORT __attribute__((visibility("hidden")))
+#		ifdef _MSC_VER
+#			define XINFO_NO_EXPORT
+#		else
+#			define XINFO_NO_EXPORT __attribute__((visibility("hidden")))
+#		endif
 #  endif
 #endif
 
 #ifndef XINFO_DEPRECATED
-#  define XINFO_DEPRECATED __attribute__ ((__deprecated__))
+#	ifdef _MSC_VER
+#		define XINFO_DEPRECATED __declspec(deprecated)
+#	else
+#		define XINFO_DEPRECATED __attribute__ ((__deprecated__))
+#	endif
 #endif
 
 #ifndef XINFO_DEPRECATED_EXPORT