authorgravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2018-03-10 16:59:53-08:00
committergravatar for andrea@orru.ioAndrea Orru <andrea@orru.io> 2018-03-10 16:59:53-08:00
logc18059a3ddcaec1bef18180ec797fe41baeac7f3
tree11b2fbf16818e2b857c546a40df74b24a20a1b4b
parentd0621391bc8acccfa214dfeac0d5be2f90c1ab8e
parent5bc4f1e3f12d8d872767e767cc298fbe293ef119

Merge branch 'master' of https://github.com/zig-lang/zig

3 files changed, 5 insertions(+), 2 deletions(-)

CMakeLists.txt+1-1
...@@ -709,7 +709,7 @@ target_link_libraries(zig LINK_PUBLIC...@@ -709,7 +709,7 @@ target_link_libraries(zig LINK_PUBLIC
709 ${LLVM_LIBRARIES}709 ${LLVM_LIBRARIES}
710 ${CMAKE_THREAD_LIBS_INIT}710 ${CMAKE_THREAD_LIBS_INIT}
711)711)
712if(APPLE)712if(NOT MSVC)
713 target_link_libraries(zig LINK_PUBLIC xml2)713 target_link_libraries(zig LINK_PUBLIC xml2)
714endif()714endif()
715if(ZIG_DIA_GUIDS_LIB)715if(ZIG_DIA_GUIDS_LIB)
README.md+1
...@@ -126,6 +126,7 @@ libc. Create demo games using Zig....@@ -126,6 +126,7 @@ libc. Create demo games using Zig.
126 * cmake >= 2.8.5126 * cmake >= 2.8.5
127 * gcc >= 5.0.0 or clang >= 3.6.0127 * gcc >= 5.0.0 or clang >= 3.6.0
128 * LLVM, Clang, LLD development libraries == 6.x, compiled with the same gcc or clang version above128 * LLVM, Clang, LLD development libraries == 6.x, compiled with the same gcc or clang version above
129 - These depend on zlib and libxml2.
129130
130##### Windows131##### Windows
131132
build.zig+3-1
...@@ -68,7 +68,6 @@ pub fn build(b: &Builder) !void {...@@ -68,7 +68,6 @@ pub fn build(b: &Builder) !void {
6868
69 exe.linkSystemLibrary("pthread");69 exe.linkSystemLibrary("pthread");
70 } else if (exe.target.isDarwin()) {70 } else if (exe.target.isDarwin()) {
71 exe.linkSystemLibrary("xml2");
72 exe.linkSystemLibrary("c++");71 exe.linkSystemLibrary("c++");
73 }72 }
7473
...@@ -76,6 +75,9 @@ pub fn build(b: &Builder) !void {...@@ -76,6 +75,9 @@ pub fn build(b: &Builder) !void {
76 exe.addObjectFile(dia_guids_lib);75 exe.addObjectFile(dia_guids_lib);
77 }76 }
7877
78 if (exe.target.getOs() != builtin.Os.windows) {
79 exe.linkSystemLibrary("xml2");
80 }
79 exe.linkSystemLibrary("c");81 exe.linkSystemLibrary("c");
8082
81 b.default_step.dependOn(&exe.step);83 b.default_step.dependOn(&exe.step);