mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-17 13:51:09 +02:00
Code Issues Projects Releases Wiki Activity

Don't complain about missing msvc libs when trying to compile with mingw gcc

Browse Source 
(... which is not supported, so the libs for it are indeed missing, but the error message still involves msvc, which is wrong.)
This commit is contained in:
Tamás Bálint Misius
2021-07-31 17:05:33 +02:00
parent a3a45db3e4
commit dd300e79d1
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@@ -76,16 +76,15 @@ if use_tpt_libs != 'no'
if copt_architecture == 'x86_64' and copt_platform == 'win' and copt_compiler == 'gcc' if copt_architecture == 'x86_64' and copt_platform == 'win' and copt_compiler == 'gcc'
nope = true nope = true
endif endif
if nope
error('no prebuilt @0@-@1@-@2@-@3@ libraries are currently provided'.format(copt_architecture, copt_platform, copt_compiler, use_tpt_libs))
endif
quad_compiler = copt_compiler quad_compiler = copt_compiler
if use_tpt_libs == 'dynamic' and copt_platform == 'win' if use_tpt_libs == 'dynamic' and copt_platform == 'win'
# DLLs should be compatible with anything, right? # DLLs should be compatible with anything, right?
quad_compiler = 'msvc' quad_compiler = 'msvc'
endif endif
quad = '@0@-@1@-@2@-@3@'.format(copt_architecture, copt_platform, quad_compiler, use_tpt_libs) tpt_libs = subproject('tpt-libs-prebuilt-@0@-@1@-@2@-@3@-@4@'.format(copt_architecture, copt_platform, quad_compiler, use_tpt_libs, tpt_libs_vtag))
if nope
error('no prebuilt @0@ libraries are currently provided'.format(quad))
endif
tpt_libs = subproject('tpt-libs-prebuilt-@0@-@1@'.format(quad, tpt_libs_vtag))
endif endif
uopt_native = get_option('native') uopt_native = get_option('native')