Skip to content

Commit 02f44d6

Browse files
author
Marc Jakobi
committed
fix(msvc): no .lib files built
1 parent 534bfed commit 02f44d6

File tree

2 files changed

+27
-5
lines changed

2 files changed

+27
-5
lines changed

src/lib.rs

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,20 @@ impl Build {
145145
config.define("LUA_USE_APICHECK", None);
146146
}
147147

148-
let lib_name = match version {
149-
Lua51 => "lua5.1",
150-
Lua52 => "lua5.2",
151-
Lua53 => "lua5.3",
152-
Lua54 => "lua5.4",
148+
let lib_name = if target.contains("msvc") {
149+
match version {
150+
Lua51 => "lua51",
151+
Lua52 => "lua52",
152+
Lua53 => "lua53",
153+
Lua54 => "lua54",
154+
}
155+
} else {
156+
match version {
157+
Lua51 => "lua5.1",
158+
Lua52 => "lua5.2",
159+
Lua53 => "lua5.3",
160+
Lua54 => "lua5.4",
161+
}
153162
};
154163

155164
config

testcrate/build.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,18 @@ fn main() {
1111
let version = lua_src::Lua54;
1212

1313
let artifacts = lua_src::Build::new().build(version);
14+
let mut has_lib = false;
15+
let lib_ext = if cfg!(target_env = "msvc") {
16+
".lib"
17+
} else {
18+
".a"
19+
};
20+
for dir_entry in std::fs::read_dir(artifacts.lib_dir()).unwrap() {
21+
let entry = dir_entry.unwrap().path();
22+
if entry.to_path_buf().to_string_lossy().ends_with(lib_ext) {
23+
has_lib = true;
24+
}
25+
}
26+
assert!(has_lib);
1427
artifacts.print_cargo_metadata();
1528
}

0 commit comments

Comments
 (0)