diff options
| author | gingerBill <gingerBill@users.noreply.github.com> | 2025-07-20 13:22:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-20 13:22:47 +0100 |
| commit | 98c2425fe0aaa749e08387986afc0aa4797ed0da (patch) | |
| tree | a7ea85baeee1fa4644f296eaf923a6d8cadf746c /base | |
| parent | a90ee538666fbfb0dae1818d3a219d0ea8bc859e (diff) | |
| parent | 63b9cb18ef9d64c1de6b5dbb018993968586dd59 (diff) | |
Merge pull request #5467 from harold-b/hb.ios-subtarget-rename-iphone
Rename `iOS` subtarget to `iPhone`, add `ODIN_PLATFORM_SUBTARGET_IOS`
Diffstat (limited to 'base')
| -rw-r--r-- | base/builtin/builtin.odin | 2 | ||||
| -rw-r--r-- | base/runtime/core.odin | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/base/builtin/builtin.odin b/base/builtin/builtin.odin index af102ee0b..2dd214321 100644 --- a/base/builtin/builtin.odin +++ b/base/builtin/builtin.odin @@ -145,7 +145,7 @@ ODIN_OS_STRING :: ODIN_OS_STRING /* An `enum` value indicating the platform subtarget, chosen using the `-subtarget` switch. - Possible values are: `.Default` `.iOS`, .iPhoneSimulator, and `.Android`. + Possible values are: `.Default` `.iPhone`, .iPhoneSimulator, and `.Android`. */ ODIN_PLATFORM_SUBTARGET :: ODIN_PLATFORM_SUBTARGET diff --git a/base/runtime/core.odin b/base/runtime/core.odin index 6c43e6c16..090d1a65b 100644 --- a/base/runtime/core.odin +++ b/base/runtime/core.odin @@ -557,7 +557,7 @@ ALL_ODIN_OS_TYPES :: Odin_OS_Types{ // Defined internally by the compiler Odin_Platform_Subtarget_Type :: enum int { Default, - iOS, + iPhone, iPhoneSimulator Android, } @@ -566,6 +566,8 @@ Odin_Platform_Subtarget_Type :: type_of(ODIN_PLATFORM_SUBTARGET) Odin_Platform_Subtarget_Types :: bit_set[Odin_Platform_Subtarget_Type] +@(builtin) +ODIN_PLATFORM_SUBTARGET_IOS :: ODIN_PLATFORM_SUBTARGET == .iPhone || ODIN_PLATFORM_SUBTARGET == .iPhoneSimulator /* // Defined internally by the compiler |