diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2022-11-05 02:34:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-05 02:34:24 -0400 |
| commit | 1d680459197e7ba5e163d99e07fdfe54c2ad9225 (patch) | |
| tree | 3e95a4d15194369e1640dc508ebe9c064f11fb63 /src/windows_sdk.cpp | |
| parent | e9a12491f6fe5e38a05eeef0e920f2dec23634a4 (diff) | |
| parent | 986b7ce5b27d5aa5fb2f31d70fd2cd863926bcba (diff) | |
| download | zig-1d680459197e7ba5e163d99e07fdfe54c2ad9225.tar.gz zig-1d680459197e7ba5e163d99e07fdfe54c2ad9225.zip | |
Merge pull request #13101 from alichraghi/o4
Diffstat (limited to 'src/windows_sdk.cpp')
| -rw-r--r-- | src/windows_sdk.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/windows_sdk.cpp b/src/windows_sdk.cpp index 25620805cd..6bc1ed7e01 100644 --- a/src/windows_sdk.cpp +++ b/src/windows_sdk.cpp @@ -21,7 +21,7 @@ struct ZigWindowsSDKPrivate { enum NativeArch { NativeArchArm, - NativeArchi386, + NativeArchx86, NativeArchx86_64, NativeArchAarch64, }; @@ -29,7 +29,7 @@ enum NativeArch { #if defined(_M_ARM) || defined(__arm_) static const NativeArch native_arch = NativeArchArm; #elif defined(_M_IX86) || defined(__i386__) -static const NativeArch native_arch = NativeArchi386; +static const NativeArch native_arch = NativeArchx86; #elif defined(_M_X64) || defined(__x86_64__) static const NativeArch native_arch = NativeArchx86_64; #elif defined(_M_ARM64) || defined(__aarch64__) @@ -110,7 +110,7 @@ static ZigFindWindowsSdkError find_msvc_lib_dir(ZigWindowsSDKPrivate *priv) { fclose(tools_file); out_append_ptr += sprintf(out_append_ptr, "VC\\Tools\\MSVC\\%s\\lib\\", tmp_path); switch (native_arch) { - case NativeArchi386: + case NativeArchx86: out_append_ptr += sprintf(out_append_ptr, "x86\\"); break; case NativeArchx86_64: @@ -158,7 +158,7 @@ com_done:; char *tmp_buf_append_ptr = tmp_buf + (cb_data - 1); tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "VC\\Lib\\"); switch (native_arch) { - case NativeArchi386: + case NativeArchx86: //x86 is in the root of the Lib folder break; case NativeArchx86_64: @@ -219,7 +219,7 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) { case NativeArchx86_64: option_name = "OptionId.DesktopCPPx64"; break; - case NativeArchi386: + case NativeArchx86: option_name = "OptionId.DesktopCPPx86"; break; default: |