TheCloud/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-08-04 02:07:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

builder: fix msvc build thirdparty obj file from .cpp (fix #22772) (#22789)

Browse Source
This commit is contained in:
Felipe Pena 2024-11-08 07:35:14 -03:00 committed by GitHub
parent 7f497b660c
commit 43d9cd6e90
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/tools/modules/testing/common.v
View File

@ -226,7 +226,6 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
skip_files << 'examples/coroutines/coroutines_bench.v' skip_files << 'examples/coroutines/coroutines_bench.v'
$if msvc { $if msvc {
skip_files << 'vlib/v/tests/consts/const_comptime_eval_before_vinit_test.v' // _constructor used skip_files << 'vlib/v/tests/consts/const_comptime_eval_before_vinit_test.v' // _constructor used
skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.c.v'
} }
$if solaris { $if solaris {
skip_files << 'examples/pico/pico.v' skip_files << 'examples/pico/pico.v'

6
vlib/v/builder/msvc_windows.v
View File

@ -401,7 +401,11 @@ fn (mut v Builder) build_thirdparty_obj_file_with_msvc(mod string, path string,
} }
println('${obj_path} not found, building it (with msvc)...') println('${obj_path} not found, building it (with msvc)...')
flush_stdout() flush_stdout()
cfile := '${path_without_o_postfix}.c' cfile := if os.exists('${path_without_o_postfix}.c') {
'${path_without_o_postfix}.c'
} else {
'${path_without_o_postfix}.cpp'
}
flags := msvc_string_flags(moduleflags) flags := msvc_string_flags(moduleflags)
inc_dirs := flags.inc_paths.join(' ') inc_dirs := flags.inc_paths.join(' ')
defines := flags.defines.join(' ') defines := flags.defines.join(' ')