updaete

Signed-off-by: abaojin <[email protected]>
hellowod · Feb 23, 2017 · 440fab2 · 440fab2
1 parent a93d7d2
commit 440fab2
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 8 deletions.
diff --git a/NativePlugins/CMakeLists.txt b/NativePlugins/CMakeLists.txt
@@ -25,6 +25,7 @@ if (APPLE)
         set_target_properties ( tstunity PROPERTIES BUNDLE TRUE )
     endif ()
 else ( )
+	add_definitions("-DLIBTST_BUILD")
     add_library(tstunity SHARED
         ${TSTUNITY_CORE}
     )

diff --git a/NativePlugins/tstunity/tstunity_conf.h b/NativePlugins/tstunity/tstunity_conf.h
@@ -2,8 +2,12 @@
 config
 */
 
-#if defined(_MSC_VER)
-#define TST_API __declspec(dllexport)
+#if defined _WIN32
+    #if LIBTST_BUILD
+        #define TST_API __declspec(dllexport)
+    #else
+        #define TST_API __declspec(dllimport)
+    #endif
 #else
-#define TST_API
+    #define TST_API
 #endif
diff --git a/PluginsBuild/NativePlugins/x86/tstunity.dll b/PluginsBuild/NativePlugins/x86/tstunity.dll
diff --git a/PluginsBuild/NativePlugins/x86_64/tstunity.dll b/PluginsBuild/NativePlugins/x86_64/tstunity.dll
diff --git a/PluginsDeme/Assets/Plugins/x86.meta b/PluginsDeme/Assets/Plugins/x86.meta
diff --git a/PluginsDeme/Assets/Plugins/x86/tstunity.dll b/PluginsDeme/Assets/Plugins/x86/tstunity.dll
diff --git a/PluginsDeme/Assets/Plugins/x86/tstunity.dll.meta b/PluginsDeme/Assets/Plugins/x86/tstunity.dll.meta
diff --git a/PluginsDeme/Assets/Plugins/x86_64/tstunity.dll b/PluginsDeme/Assets/Plugins/x86_64/tstunity.dll
diff --git a/PluginsDeme/Assets/Plugins/x86_64/tstunity.dll.meta b/PluginsDeme/Assets/Plugins/x86_64/tstunity.dll.meta