Merge pull request #390 from justinweiss/ctr-fix-dynarec-crashes

[pcsx_rearmed.git] / frontend / libretro_core_options.h

diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index 9509f2d..badd856 100644 (file)
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -266,6 +266,17 @@ struct retro_core_option_definition option_defs_us[] = {
       },
       "linear",
    },
+   {
+      "pcsx_rearmed_analog_axis_modifier",
+      "Analog axis bounds.",
+      "Range bounds for analog axis. Square bounds help controllers with highly circular ranges that are unable to fully saturate the x and y axis at 45degree deflections.",
+      {
+         { "circle", NULL },
+         { "square", NULL },
+         { NULL, NULL },
+      },
+      "circle",
+   },
    {
       "pcsx_rearmed_vibration",
       "Enable Vibration",
@@ -530,7 +541,11 @@ struct retro_core_option_definition option_defs_us[] = {
          { "enabled",  NULL },
          { NULL, NULL },
       },
+#ifdef HAVE_LIBNX
+         "disabled",
+#else
       "enabled",
+#endif
    },
 
 #ifndef DRC_DISABLE
@@ -635,7 +650,7 @@ struct retro_core_option_definition option_defs_us[] = {
    },
 #endif /* DRC_DISABLE */
 
-#ifdef __ARM_NEON__
+#ifdef GPU_NEON
    {
       "pcsx_rearmed_neon_interlace_enable",
       "Enable Interlacing Mode",
@@ -669,7 +684,7 @@ struct retro_core_option_definition option_defs_us[] = {
       },
       "disabled",
    },
-#endif /* __ARM_NEON__ */
+#endif /* GPU_NEON */
 
    {
       "pcsx_rearmed_duping_enable",