Conditional compilation for v1.5 features; #387

vanjac · Jul 20, 2024 · 211ed51 · 211ed51
1 parent adf8d06
commit 211ed51
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Assets/Base/WorldProperties.cs b/Assets/Base/WorldProperties.cs
@@ -118,6 +118,7 @@ public IEnumerable<Property> Properties() =>
                 () => RenderSettings.fogColor,
                 v => RenderSettings.fogColor = (Color) v,
                 PropertyGUIs.Color),
+#if NSPACE_1_5
             new Property("grv", s => s.PropGravity,
                 () => -Physics.gravity.y,
                 v => {
@@ -126,6 +127,7 @@ public IEnumerable<Property> Properties() =>
                     Physics.gravity = gravity;
                 },
                 PropertyGUIs.Float),
+#endif
         };
 
     public IEnumerable<Property> DeprecatedProperties() =>

diff --git a/Assets/GameScripts.cs b/Assets/GameScripts.cs
@@ -111,7 +111,7 @@ public static PropertiesObjectType FindTypeWithName(PropertiesObjectType[] types
         TeleportBehavior.objectType,
         MoveWithBehavior.objectType,
         ScaleBehavior.objectType,
-        // JoystickBehavior.objectType,
+        JoystickBehavior.objectType,
 
         VisibleBehavior.objectType,
         LightBehavior.objectType,
@@ -151,7 +151,9 @@ public static string[] BehaviorTabNames(GUIStringSet s) =>
             TeleportBehavior.objectType,
             MoveWithBehavior.objectType,
             ScaleBehavior.objectType,
-            // JoystickBehavior.objectType,
+#if NSPACE_1_5
+            JoystickBehavior.objectType,
+#endif
         },
         new BehaviorType[] {
             VisibleBehavior.objectType,
@@ -171,7 +173,9 @@ public static string[] BehaviorTabNames(GUIStringSet s) =>
             CarryableBehavior.objectType,
             WaterBehavior.objectType,
             ForceBehavior.objectType,
+#if NSPACE_1_5
             RopeBehavior.objectType,
+#endif
         },
         new BehaviorType[] {
             SoundBehavior.objectType,

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -779,14 +779,7 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 1
-  scriptingDefineSymbols:
-    1: CROSS_PLATFORM_INPUT
-    4: CROSS_PLATFORM_INPUT;MOBILE_INPUT
-    7: CROSS_PLATFORM_INPUT;MOBILE_INPUT
-    14: MOBILE_INPUT
-    17: MOBILE_INPUT
-    20: MOBILE_INPUT
-    22: MOBILE_INPUT
+  scriptingDefineSymbols: {}
   additionalCompilerArguments: {}
   platformArchitecture:
     iPhone: 1