Fixed build

deathkiller · Apr 21, 2024 · fd32e2a · fd32e2a
1 parent 2ea6a07
commit fd32e2a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/Sources/Shared/IO/FileSystem.h b/Sources/Shared/IO/FileSystem.h
@@ -80,7 +80,7 @@ namespace Death { namespace IO {
 
 		DEFINE_PRIVATE_ENUM_OPERATORS(EnumerationOptions);
 
-//		/** @brief The class that handles directory traversal, should be used as iterator */
+		/** @brief The class that handles directory traversal, should be used as iterator */
 		class Directory
 		{
 		public:

diff --git a/Sources/nCine/Input/JoyMapping.cpp b/Sources/nCine/Input/JoyMapping.cpp
@@ -22,19 +22,19 @@ namespace nCine
 
 #if defined(DEATH_TARGET_ANDROID)
 		constexpr AxisName AndroidAxisNameMapping[] = {
-			AxisName::LX,
-			AxisName::LY,
-			AxisName::RX,
-			AxisName::RY,
-			AxisName::LTRIGGER,
-			AxisName::RTRIGGER
+			AxisName::LeftX,
+			AxisName::LeftY,
+			AxisName::RightX,
+			AxisName::RightY,
+			AxisName::LeftTrigger,
+			AxisName::RightTrigger
 		};
 
 		constexpr ButtonName AndroidDpadButtonNameMapping[] = {
-			ButtonName::DPAD_UP,
-			ButtonName::DPAD_RIGHT,
-			ButtonName::DPAD_DOWN,
-			ButtonName::DPAD_LEFT
+			ButtonName::Up,
+			ButtonName::Right,
+			ButtonName::Down,
+			ButtonName::Left
 		};
 #endif
 
@@ -460,12 +460,12 @@ namespace nCine
 				mapping.desc.axes[i].max = 1.0f;
 			}
 
-			constexpr int AndroidButtonCount = (int)ButtonName::MISC1;
+			constexpr int AndroidButtonCount = (int)ButtonName::Misc1;
 			for (int i = 0; i < AndroidButtonCount; i++) {
 				mapping.desc.buttons[i] = (ButtonName)i;
 			}
 			for (int i = AndroidButtonCount; i < countof(mapping.desc.buttons); i++) {
-				mapping.desc.buttons[i] = ButtonName::UNKNOWN;
+				mapping.desc.buttons[i] = ButtonName::Unknown;
 			}
 
 			for (int i = 0; i < countof(AndroidDpadButtonNameMapping); i++) {