authorgravatar for johnnymarler@gmail.comJonathan Marler <johnnymarler@gmail.com> 2021-09-07 21:49:08-06:00
committergravatar for johnnymarler@gmail.comJonathan Marler <johnnymarler@gmail.com> 2021-09-07 21:49:08-06:00
log343547d4a4cf8a98b6380881aa310fa7868e7486
tree307f8295600f16394e7ab7ff65a47b911c26931b
parent375619820ecb8e34d38749fb4dc339258b2766a6

finalize windows_sdk paths based on snickler suggestions

1 files changed, 3 insertions(+), 6 deletions(-)

src/windows_sdk.cpp+3-6
...@@ -32,7 +32,7 @@ static const NativeArch native_arch = NativeArchArm;...@@ -32,7 +32,7 @@ static const NativeArch native_arch = NativeArchArm;
32static const NativeArch native_arch = NativeArchi386;32static const NativeArch native_arch = NativeArchi386;
33#elif defined(_M_X64) || defined(__x86_64__)33#elif defined(_M_X64) || defined(__x86_64__)
34static const NativeArch native_arch = NativeArchx86_64;34static const NativeArch native_arch = NativeArchx86_64;
35#elif defined(__aarch64__)35#elif defined(_M_ARM64) || defined(__aarch64__)
36static const NativeArch native_arch = NativeArchAarch64;36static const NativeArch native_arch = NativeArchAarch64;
37#else37#else
38#error unsupported architecture38#error unsupported architecture
...@@ -120,8 +120,7 @@ static ZigFindWindowsSdkError find_msvc_lib_dir(ZigWindowsSDKPrivate *priv) {...@@ -120,8 +120,7 @@ static ZigFindWindowsSdkError find_msvc_lib_dir(ZigWindowsSDKPrivate *priv) {
120 out_append_ptr += sprintf(out_append_ptr, "arm\\");120 out_append_ptr += sprintf(out_append_ptr, "arm\\");
121 break;121 break;
122 case NativeArchAarch64:122 case NativeArchAarch64:
123 // TODO: is this right?123 out_append_ptr += sprintf(out_append_ptr, "arm64\\");
124 out_append_ptr += sprintf(out_append_ptr, "aarch64\\");
125 break;124 break;
126 }125 }
127 sprintf(tmp_buf, "%s%s", output_path, "vcruntime.lib");126 sprintf(tmp_buf, "%s%s", output_path, "vcruntime.lib");
...@@ -169,8 +168,7 @@ com_done:;...@@ -169,8 +168,7 @@ com_done:;
169 tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "arm\\");168 tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "arm\\");
170 break;169 break;
171 case NativeArchAarch64:170 case NativeArchAarch64:
172 // TODO: is this right?171 tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "arm64\\");
173 tmp_buf_append_ptr += sprintf(tmp_buf_append_ptr, "aarch64\\");
174 break;172 break;
175 }173 }
176174
...@@ -216,7 +214,6 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {...@@ -216,7 +214,6 @@ static ZigFindWindowsSdkError find_10_version(ZigWindowsSDKPrivate *priv) {
216 option_name = "OptionId.DesktopCPParm";214 option_name = "OptionId.DesktopCPParm";
217 break;215 break;
218 case NativeArchAarch64:216 case NativeArchAarch64:
219 // TODO: is this right?
220 option_name = "OptionId.DesktopCPParm64";217 option_name = "OptionId.DesktopCPParm64";
221 break;218 break;
222 case NativeArchx86_64:219 case NativeArchx86_64: