Browse Source

use ATOMIC_MOBILE so covers iOS and Android

Josh Engebretson 9 years ago
parent
commit
4c920b3c48

+ 1 - 1
Script/AtomicNET/AtomicNET/Application/Application.cs

@@ -34,7 +34,7 @@ namespace AtomicEngine
 #endif
 #endif
 
 
 
 
-#if ATOMIC_ANDROID || ATOMIC_IOS
+#if ATOMIC_MOBILE
 
 
             app = NETAtomicPlayer.Create(args);
             app = NETAtomicPlayer.Create(args);
             
             

+ 5 - 5
Script/AtomicNET/AtomicNET/Scene/CSComponentCore.cs

@@ -11,7 +11,7 @@ namespace AtomicEngine
         public CSComponentInfo(Type type)
         public CSComponentInfo(Type type)
         {
         {
 
 
-#if ATOMIC_DESKTOP || ATOMIC_ANDROID
+#if ATOMIC_DESKTOP || ATOMIC_MOBILE
 
 
             this.Type = type;
             this.Type = type;
 
 
@@ -56,7 +56,7 @@ namespace AtomicEngine
         {
         {
             // FIXME: This will need to be optimized, specifically to use uint key hashes for value lookup
             // FIXME: This will need to be optimized, specifically to use uint key hashes for value lookup
 
 
-#if ATOMIC_DESKTOP || ATOMIC_ANDROID
+#if ATOMIC_DESKTOP || ATOMIC_MOBILE
 
 
             fieldMap.CopyVariantMap(fieldValuePtr);
             fieldMap.CopyVariantMap(fieldValuePtr);
 
 
@@ -334,7 +334,7 @@ namespace AtomicEngine
 
 
         void HandleComponentAssemblyReference(uint eventType, ScriptVariantMap eventData)
         void HandleComponentAssemblyReference(uint eventType, ScriptVariantMap eventData)
         {
         {
-#if ATOMIC_DESKTOP || ATOMIC_ANDROID
+#if ATOMIC_DESKTOP || ATOMIC_MOBILE
             string assemblyPath = eventData["AssemblyPath"];
             string assemblyPath = eventData["AssemblyPath"];
 
 
             string assemblyName = Path.GetFileNameWithoutExtension(assemblyPath);
             string assemblyName = Path.GetFileNameWithoutExtension(assemblyPath);
@@ -349,7 +349,7 @@ namespace AtomicEngine
 
 
         void ParseComponents()
         void ParseComponents()
         {
         {
-#if ATOMIC_DESKTOP || ATOMIC_ANDROID
+#if ATOMIC_DESKTOP || ATOMIC_MOBILE
 
 
             var assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
             var assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
 
 
@@ -362,7 +362,7 @@ namespace AtomicEngine
 
 
         void ParseAssembly(Assembly assembly)
         void ParseAssembly(Assembly assembly)
         {
         {
-#if ATOMIC_DESKTOP || ATOMIC_ANDROID
+#if ATOMIC_DESKTOP || ATOMIC_MOBILE
             String assemblyPath = assembly.GetName().Name;
             String assemblyPath = assembly.GetName().Name;
 
 
             Dictionary<string, CSComponentInfo> assemblyTypes = null;
             Dictionary<string, CSComponentInfo> assemblyTypes = null;