Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions make.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def parse_argv():
target = parser.add_argument_group(title='Target')
target.add_argument('-compiler', choices=['vs2015', 'vs2017', 'vs2019', 'vs2019-clang', 'vs2022', 'vs2022-clang', 'android', 'clang4', 'clang5', 'clang6', 'clang7', 'clang8', 'clang9', 'clang10', 'clang11', 'clang12', 'clang13', 'clang14', 'clang15', 'clang16', 'clang17', 'clang18', 'gcc4.8', 'gcc4.9', 'gcc5', 'gcc6', 'gcc7', 'gcc8', 'gcc9', 'gcc10', 'gcc11', 'gcc12', 'gcc13', 'osx', 'ios', 'emscripten'], help='Defaults to the host system\'s default compiler')
target.add_argument('-config', choices=['Debug', 'Release'], type=str.capitalize)
target.add_argument('-cpu', choices=['x86', 'x64', 'armv7', 'arm64', 'wasm'], help='Defaults to the host system\'s architecture')
target.add_argument('-cpu', choices=['x86', 'x64', 'armv7', 'arm64', 'arm64ec', 'wasm'], help='Defaults to the host system\'s architecture')
target.add_argument('-cpp_version', choices=['11', '14', '17', '20'], help='Defaults to C++11')

misc = parser.add_argument_group(title='Miscellaneous')
Expand Down Expand Up @@ -100,7 +100,11 @@ def parse_argv():
is_arm_supported = True

if not is_arm_supported:
print('arm64 is only supported with VS2017, VS2019, OS X (M1 processors), Linux, Android, and iOS')
print('arm64 is only supported with VS2017, VS2019, VS2022, OS X (M* processors), Linux, Android, and iOS')
sys.exit(1)
elif args.cpu == 'arm64ec':
if not args.compiler in ['vs2019', 'vs2022']:
print('arm64ec is only supported with VS2019 and VS2022')
sys.exit(1)
elif args.cpu == 'armv7':
if not args.compiler == 'android':
Expand Down
Loading