add android32

geode-sdk · Dec 23, 2023 · 657d19d · 657d19d
1 parent 71d89ac
commit 657d19d
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/include/ast.hpp b/include/ast.hpp
@@ -15,7 +15,8 @@ namespace broma {
 		Windows = 2,
 		Android = 4,
 		iOS = 8,
-		Android64 = 16,
+		Android32 = 16,
+		Android64 = 32,
 	};
 
 	inline Platform operator|(Platform a, Platform b) {
@@ -41,7 +42,7 @@ namespace broma {
 		ptrdiff_t mac = -1;
 		ptrdiff_t ios = -1;
 		ptrdiff_t win = -1;
-		ptrdiff_t android = -1;
+		ptrdiff_t android32 = -1;
 		ptrdiff_t android64 = -1;
 	};
 

diff --git a/src/attribute.hpp b/src/attribute.hpp
@@ -121,7 +121,14 @@ namespace broma {
 	struct run_action<tagged_rule<link_attribute, keyword_android>> {
 		template <typename T>
 		static void apply(T& input, Root* root, ScratchData* scratch) {
-			scratch->wip_link_platform |= Platform::Android;
+			scratch->wip_link_platform |= Platform::Android32 | Platform::Android64;
+		}
+	};
+	template <>
+	struct run_action<tagged_rule<link_attribute, keyword_android32>> {
+		template <typename T>
+		static void apply(T& input, Root* root, ScratchData* scratch) {
+			scratch->wip_link_platform |= Platform::Android32;
 		}
 	};
 	template <>
@@ -165,12 +172,18 @@ namespace broma {
 			scratch->wip_missing_platform |= Platform::Windows;
 		}
 	};
-
 	template <>
 	struct run_action<tagged_rule<missing_attribute, keyword_android>> {
 		template <typename T>
 		static void apply(T& input, Root* root, ScratchData* scratch) {
-			scratch->wip_missing_platform |= Platform::Android;
+			scratch->wip_missing_platform |= Platform::Android32 | Platform::Android64;
+		}
+	};
+	template <>
+	struct run_action<tagged_rule<missing_attribute, keyword_android32>> {
+		template <typename T>
+		static void apply(T& input, Root* root, ScratchData* scratch) {
+			scratch->wip_missing_platform |= Platform::Android32;
 		}
 	};
 	template <>

diff --git a/src/basic_components.hpp b/src/basic_components.hpp
@@ -85,6 +85,7 @@ namespace broma {
 	keyword(win);
 	keyword(ios);
 	keyword(android);
+	keyword(android32);
 	keyword(android64);
 	keyword(PAD);
 
@@ -101,5 +102,5 @@ namespace broma {
 
 	/// @brief A platform identifier (mac, win, ios, android).
 	template <typename T>
-	struct tagged_platform : tagged_for_each<T, sor<keyword_mac, keyword_win, keyword_ios, keyword_android, keyword_android64>> {};
+	struct tagged_platform : tagged_for_each<T, sor<keyword_mac, keyword_win, keyword_ios, keyword_android, keyword_android32, keyword_android64>> {};
 } // namespace broma
diff --git a/src/bind.hpp b/src/bind.hpp
@@ -52,10 +52,10 @@ namespace broma {
 		}
 	};
 	template <>
-	struct run_action<tagged_rule<bind, keyword_android>> {
+	struct run_action<tagged_rule<bind, keyword_android32>> {
 		template <typename T>
 		static void apply(T& input, Root* root, ScratchData* scratch) {
-			scratch->wip_bind_platform = Platform::Android;
+			scratch->wip_bind_platform = Platform::Android32;
 		}
 	};
 	template <>
@@ -82,8 +82,11 @@ namespace broma {
 				case Platform::Windows:
 					scratch->wip_bind.win = out;
 					break;
-				case Platform::Android:
-					scratch->wip_bind.android = out;
+				case Platform::Android32:
+					scratch->wip_bind.android32 = out;
+					break;
+				case Platform::Android64:
+					scratch->wip_bind.android64 = out;
 					break;
 				default:
 					break;