xml2 workaround is relevant for linux too

master
Andrew Kelley 2018-03-10 18:23:08 -05:00
parent 10fb1f2730
commit 5bc4f1e3f1
3 changed files with 5 additions and 2 deletions

View File

@ -709,7 +709,7 @@ target_link_libraries(zig LINK_PUBLIC
${LLVM_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
)
if(APPLE)
if(NOT MSVC)
target_link_libraries(zig LINK_PUBLIC xml2)
endif()
if(ZIG_DIA_GUIDS_LIB)

View File

@ -126,6 +126,7 @@ libc. Create demo games using Zig.
* cmake >= 2.8.5
* gcc >= 5.0.0 or clang >= 3.6.0
* LLVM, Clang, LLD development libraries == 6.x, compiled with the same gcc or clang version above
- These depend on zlib and libxml2.
##### Windows

View File

@ -68,7 +68,6 @@ pub fn build(b: &Builder) !void {
exe.linkSystemLibrary("pthread");
} else if (exe.target.isDarwin()) {
exe.linkSystemLibrary("xml2");
exe.linkSystemLibrary("c++");
}
@ -76,6 +75,9 @@ pub fn build(b: &Builder) !void {
exe.addObjectFile(dia_guids_lib);
}
if (exe.target.getOs() != builtin.Os.windows) {
exe.linkSystemLibrary("xml2");
}
exe.linkSystemLibrary("c");
b.default_step.dependOn(&exe.step);