Skip to content

MSVC Generator allow mixed sources #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
travbid merged 3 commits into from
Apr 4, 2026
Merged

MSVC Generator allow mixed sources #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e24c956
test: Add test data to confirm MSVC compiles *.c files as C
travbid Apr 4, 2026
08b3f29
fix: Allow mixed C and C++ sources in MSVC generator
travbid Apr 4, 2026
46964f0
refactor: Use io::Writer instead of concatenating string
travbid Apr 4, 2026
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
24 changes: 11 additions & 13 deletions src/generator/msvc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ fn item_definition_group(
);

if !sources.c.is_empty() || !sources.cpp.is_empty() {
ret += &cl_compile(&profile.vcxproj, include_dirs, defines, opts, sources.cpp.is_empty());
ret += &cl_compile(&profile.vcxproj, include_dirs, defines, opts, sources);
}
if !sources.nasm.is_empty() {
ret += &nasm_compile(profile, platform, include_dirs, defines)?;
Expand Down Expand Up @@ -190,25 +190,27 @@ fn cl_compile(
include_dirs: &[String],
defines: &[String],
opts: &Options,
compile_as_c: bool,
sources: &Sources,
) -> String {
let mut ret = " <ClCompile>\n".to_owned();

for (key, val) in &profile.cl_compile {
ret += &format!(" <{key}>{val}</{key}>\n");
}

if compile_as_c {
if !sources.c.is_empty() {
if let Some(c_std) = &opts.c_standard {
ret += " <LanguageStandard_C>";
ret += c_std.as_str();
ret += "</LanguageStandard_C>\n";
ret += " <CompileAs>CompileAsC</CompileAs>\n";
}
} else if let Some(cpp_std) = &opts.cpp_standard {
ret += " <LanguageStandard>";
ret += cpp_std.as_str();
ret += "</LanguageStandard>\n";
}
if !sources.cpp.is_empty() {
if let Some(cpp_std) = &opts.cpp_standard {
ret += " <LanguageStandard>";
ret += cpp_std.as_str();
ret += "</LanguageStandard>\n";
}
}

ret += " <AdditionalIncludeDirectories>";
Expand Down Expand Up @@ -535,11 +537,7 @@ fn make_vcxproj(
let sources = &target_data.sources;

log::debug!("make_vcxproj: {target_name}");
if !target_data.sources.c.is_empty() && !target_data.sources.cpp.is_empty() {
return Err(format!(
"This generator does not support mixing C and C++ sources. Consider splitting them into separate libraries. Target: {target_name}"
));
}

const PLATFORM_TOOLSET: &str = "v143";
let target_guid = Uuid::new_v4().to_string().to_ascii_uppercase();
let mut out_str = r#"<?xml version="1.0" encoding="utf-8"?>
Expand Down
Loading