Răsfoiți Sursa

[csharp] Fix (IS_UNITY) symbol.

pharan 8 ani în urmă
părinte
comite
ca9f46d92b
2 a modificat fișierele cu 7 adăugiri și 3 ștergeri
  1. 6 2
      spine-csharp/src/Atlas.cs
  2. 1 1
      spine-csharp/src/SkeletonBinary.cs

+ 6 - 2
spine-csharp/src/Atlas.cs

@@ -28,6 +28,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
  *****************************************************************************/
 
 
+#if (UNITY_5 || UNITY_5_3_OR_NEWER || UNITY_WSA || UNITY_WP8 || UNITY_WP8_1)
+#define IS_UNITY
+#endif
+
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.IO;
 using System.IO;
@@ -44,7 +48,7 @@ namespace Spine {
 		List<AtlasRegion> regions = new List<AtlasRegion>();
 		List<AtlasRegion> regions = new List<AtlasRegion>();
 		TextureLoader textureLoader;
 		TextureLoader textureLoader;
 
 
-		#if !(UNITY_5 || UNITY_4 || UNITY_WSA || UNITY_WP8 || UNITY_WP8_1) // !UNITY
+		#if !(IS_UNITY)
 		#if WINDOWS_STOREAPP
 		#if WINDOWS_STOREAPP
 		private async Task ReadFile(string path, TextureLoader textureLoader) {
 		private async Task ReadFile(string path, TextureLoader textureLoader) {
 			var folder = Windows.ApplicationModel.Package.Current.InstalledLocation;
 			var folder = Windows.ApplicationModel.Package.Current.InstalledLocation;
@@ -82,7 +86,7 @@ namespace Spine {
 		}
 		}
 		#endif // WINDOWS_STOREAPP
 		#endif // WINDOWS_STOREAPP
 
 
-		#endif // !(UNITY)
+		#endif
 
 
 		public Atlas (TextReader reader, string dir, TextureLoader textureLoader) {
 		public Atlas (TextReader reader, string dir, TextureLoader textureLoader) {
 			Load(reader, dir, textureLoader);
 			Load(reader, dir, textureLoader);

+ 1 - 1
spine-csharp/src/SkeletonBinary.cs

@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * POSSIBILITY OF SUCH DAMAGE.
  *****************************************************************************/
  *****************************************************************************/
 
 
-#if (UNITY_5 || UNITY_4_0 || UNITY_4_1 || UNITY_4_2 || UNITY_4_3 || UNITY_4_4 || UNITY_4_5 || UNITY_4_6 || UNITY_4_7 || UNITY_WSA || UNITY_WP8 || UNITY_WP8_1)
+#if (UNITY_5 || UNITY_5_3_OR_NEWER || UNITY_WSA || UNITY_WP8 || UNITY_WP8_1)
 #define IS_UNITY
 #define IS_UNITY
 #endif
 #endif