From d4613bb2cac72dcd48dd0b9bacb4a9de108b3a04 Mon Sep 17 00:00:00 2001 From: yuzu Date: Mon, 4 Nov 2024 20:39:37 -0500 Subject: [PATCH] fixes --- .../h/cf20cbabf4bf295b89a59be7deb31436.txt | 0 .zig-cache/h/timestamp | 0 .../dependencies.zig | 2 + .zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 | Bin 0 -> 1933 bytes .zig-cache/z/d262569f7b449ddd507423ef7e4bd492 | Bin 0 -> 5360 bytes build.zig | 53 +++++++--------- build.zig.zon | 11 ++++ .../h/f541f89a8c855e8d8c9e7ef3747d5de4.txt | 0 example/exe/.zig-cache/h/timestamp | 0 .../dependencies.zig | 11 ++++ .../z/bcf15b946bf5c3c42c96c97e20c86c29 | Bin 0 -> 4367 bytes zlib.zig | 58 ------------------ 12 files changed, 47 insertions(+), 88 deletions(-) create mode 100644 .zig-cache/h/cf20cbabf4bf295b89a59be7deb31436.txt create mode 100644 .zig-cache/h/timestamp create mode 100644 .zig-cache/o/fbc055654621661cdc60c369fbf138f9/dependencies.zig create mode 100644 .zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 create mode 100644 .zig-cache/z/d262569f7b449ddd507423ef7e4bd492 create mode 100644 build.zig.zon create mode 100644 example/exe/.zig-cache/h/f541f89a8c855e8d8c9e7ef3747d5de4.txt create mode 100644 example/exe/.zig-cache/h/timestamp create mode 100644 example/exe/.zig-cache/o/440007da036dbe975f6edb49f40a7f83/dependencies.zig create mode 100644 example/exe/.zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 delete mode 100644 zlib.zig diff --git a/.zig-cache/h/cf20cbabf4bf295b89a59be7deb31436.txt b/.zig-cache/h/cf20cbabf4bf295b89a59be7deb31436.txt new file mode 100644 index 0000000..e69de29 diff --git a/.zig-cache/h/timestamp b/.zig-cache/h/timestamp new file mode 100644 index 0000000..e69de29 diff --git a/.zig-cache/o/fbc055654621661cdc60c369fbf138f9/dependencies.zig b/.zig-cache/o/fbc055654621661cdc60c369fbf138f9/dependencies.zig new file mode 100644 index 0000000..72e4e83 --- /dev/null +++ b/.zig-cache/o/fbc055654621661cdc60c369fbf138f9/dependencies.zig @@ -0,0 +1,2 @@ +pub const packages = struct {}; +pub const root_deps: []const struct { []const u8, []const u8 } = &.{}; diff --git a/.zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 b/.zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 new file mode 100644 index 0000000000000000000000000000000000000000..7b12e7913674b2c058df3f804f19d0c99d4d7e95 GIT binary patch literal 1933 zcmcK4%WoBB7{~Fq6vPWc<*F5-Epl(q(LpPyt+j_zDsl-04UyPPXQu7g>6ydK92;As z$inCXOxUOpn$$+FZj2#;MNJ6Auw%)B1#zLWAjFl4#00;;=^SeR04MpJ_q?~~edn2X z#+d*2>LUC=l`&VcWlj`psTosUJ=L&dY3a_*d$XU;y3Ie02d&1=cM@w!At*GDTH_OG zF)?O!{9PEGd3_&rXwdk?#MkG47(Fv)6`Iq**8T8+b&-fwW;P7J`ftn}XhXB0whK`E zT&V3yEXe-vqI?P(wdUiwo>F7fzaOsfg-D}Sd{oWHXA z91^5?3n?|eKCA1VT9Jd++>Hd!;8EyawKvuEbT{CAtj9;ty?0|Blr!~xjJ0?dpFr1J ztfzQtKLE|&g(FbTl;F%~4lb$#%M~>Ii=hG1Q#larNIHqJL1164~{E+Pz zb0dDgDzQ<3yzK^Fw8_djQ&lG%Dn(u#KdeX2bf@d}1$N?9`uazlAdLT0CEj#jAzgkI{%B_@ouarNH)!9Cb^{}uR!^kl}dDDFVjXmk`tEE*Bbtzd_O9=R?qB=XK0B}ty0l&zd;ETQ_vG1o z-%LJep7+yYm(Rqf+UwOH3zIFEf4On=kIu;rw}ubtzLZQqp4Ck*!Qyi&T&H-hyh~GXM%q0#71GDn-OzIsSEu|xh)9)O(ttzY1Aq7uPXP%sm z#&T?{QcI;HBO~X0a0=t?QF(cm13rkt8edjbRp}W0i{(S^sy06HRN13A?Uj|WwW{*G z(~7DrmWck(pGW+T5^~bWXaWYG(hZ|2WP{SBx;7B0AB)}^l)Br&N*Wz=(Bq&ns9f%^ zrENze<-3b*w?)cNSKF3U-yRST%|U*;K?_KNX|~-8IRzv~*fPzQk@~^d`7jjRAYWI) zFz~`3Ky_N9)^x{ZQtP-8W`XAH2t}ay)TVM3C`Sb#e-U3k^gE#tl#>OZ9BQ2UDrV`W zFdOayt$h`!pW-oXseUV<4DN+Qcm^t=kCKw4@Kyz0^3U~-` z0yH9W#j3sdjBzg`Pa^js_kq@=IroEdI*QIiklL%2Py>qb4Uiw@RB^rqsy_@zKz`Ok z9Ynz~a6o&wAC800zzL8a_2~rn*>)GC_T@`Z&NhSQIt|?+9#nr49)>fZIprrA@~<6kk=v=$1c!X*}4m3kvG_OZ`y0n zMs~1@MHt$*Ao5O7-CGbwR~|}`{8(qQ8FD^`?qoUgC~^@}`?Cbe zkF|F#koREdo~%T^gItZ&{aK3~g1iRahmF|ExeBT^XChMPN49kB!($jaGarNYW-E3k zsE_t>JBs#q2U7hikf)G4k*T0@5ws4iL2;-~wtVW`?WV8Vq+biQ*g7j`LHoBCI~ysq zhJDz|YdvT`_G6zzswlVG8`amK%g+nQe+beI*P433K)YUhqCV=c zxdz$w!_l2~|32tL&^2c?QhSJ}jfKR`xAZ+v@*~8p}23r|Ob9wyUP(Mds_eIkkEGiCp!{OiTko!`j$BPHk8)+*j zb^C+i%SATvna@5)I%Aq4ulKhQuxGf!W~BLdZ6yIK;7D6( ziRtrWs4UaDqHx5FJ(ckZ4}Gz{dCaPkx7WWke6i|O)J5pNtLR*=tl71;$@Ie5(-Tl5bp5VUfAy2DcS8MT^Td=VA#-6WOolwrnN#SLGP^IWW585 zO>59wt~DuU&8_z?;v*hC0TMw){T1iYs-lhkoM+7O>a(5 zNCCYwy}^VMP)UWRQ|7D*<!Ne#NZwBVBWt>U@}C7&prXAS4Vj?+8oSok*CBNl#W;8jRAi5VY`76_g0avH zCO|c)$hXdO4rpH8flAnH>pG*8KUhNaLJ{sU8#Af<2%ZbVt-*>v{(2K>Kth_(5k@euAK} zcR~olpmV7EH3M`OB%cJWQF9f*Oz^=h&^$V~vq5DPw1$arGvtEubsJ2DX`o!VK)&a| zT+rH8bWSIch4V#ys?U7&#_|p~53Nh?v2cN6k?%v#_UbhG>E{-0m~<$vzQvOCd#F=> z+20tQ5$(Cwt@}_0H6=&Rr5~SnaPr>6Sx;4@&sA>JM{5!C83o!W75rG=6K_C{fRW$? zm0{5J?T-F8+pHXN)9DYQPqm);%@FFM;R@#0S-lGmg3e?udq>E+9V5*^+<%(_Z;#E=n7RZ2;^%b9dsvmfc)(Q`Fji=hbKVi_bJ!~ z)u44hgH#O9g6@*$c^)F`RBqKiA3DNnSOaTe9ju29pd365TR?kW30q+sYzM{qG-$rv zpgD9;Uw{|kB~WPz0jPaEecs%d9h*-6Jo2Yjdw%#tu_}h@;QN`dZbbLa-CkO2c>7|aLdNBso*Z~PBJMlNaq literal 0 HcmV?d00001 diff --git a/build.zig b/build.zig index 235a2a8..8d1aeca 100644 --- a/build.zig +++ b/build.zig @@ -1,37 +1,30 @@ const std = @import("std"); -const zlib = @import("zlib.zig"); - -pub fn build(b: *std.build.Builder) void { - const target = b.standardTargetOptions(.{}); - const optimize = b.standardOptimizeOption(.{}); +pub fn build(b: *std.Build) void { // Modules available to downstream dependencies - _ = b.addModule("zlib", .{ - .source_file = .{ .path = (comptime thisDir()) ++ "/src/main.zig" }, + const zlib = b.addModule("zlib", .{ + .root_source_file = b.path("src/main.zig"), + .link_libc = true, }); - const lib = zlib.create(b, target, optimize); - b.installArtifact(lib.step); + const srcs = &.{ + "zlib/adler32.c", + "zlib/compress.c", + "zlib/crc32.c", + "zlib/deflate.c", + "zlib/gzclose.c", + "zlib/gzlib.c", + "zlib/gzread.c", + "zlib/gzwrite.c", + "zlib/inflate.c", + "zlib/infback.c", + "zlib/inftrees.c", + "zlib/inffast.c", + "zlib/trees.c", + "zlib/uncompr.c", + "zlib/zutil.c", + }; - const tests = b.addTest(.{ - .root_source_file = .{ .path = "src/main.zig" }, - }); - lib.link(tests, .{}); - - const test_step = b.step("test", "Run tests"); - test_step.dependOn(&tests.step); - - const bin = b.addExecutable(.{ - .name = "example1", - .root_source_file = .{ .path = "example/example1.zig" }, - .target = target, - .optimize = optimize, - }); - lib.link(bin, .{ .import_name = "zlib" }); - b.installArtifact(bin); -} - -/// Path to the directory with the build.zig. -fn thisDir() []const u8 { - return std.fs.path.dirname(@src().file) orelse unreachable; + zlib.addCSourceFiles(.{ .files = srcs, .flags = &.{"-std=c89"} }); + zlib.addIncludePath(b.path("zlib/")); } diff --git a/build.zig.zon b/build.zig.zon new file mode 100644 index 0000000..f40917a --- /dev/null +++ b/build.zig.zon @@ -0,0 +1,11 @@ +.{ + .name = "zlib", + .version = "0.1.0", + .dependencies = .{}, + .paths = .{ + "readme.md", + "build.zig", + "build.zig.zon", + "src", + }, +} diff --git a/example/exe/.zig-cache/h/f541f89a8c855e8d8c9e7ef3747d5de4.txt b/example/exe/.zig-cache/h/f541f89a8c855e8d8c9e7ef3747d5de4.txt new file mode 100644 index 0000000..e69de29 diff --git a/example/exe/.zig-cache/h/timestamp b/example/exe/.zig-cache/h/timestamp new file mode 100644 index 0000000..e69de29 diff --git a/example/exe/.zig-cache/o/440007da036dbe975f6edb49f40a7f83/dependencies.zig b/example/exe/.zig-cache/o/440007da036dbe975f6edb49f40a7f83/dependencies.zig new file mode 100644 index 0000000..d520c69 --- /dev/null +++ b/example/exe/.zig-cache/o/440007da036dbe975f6edb49f40a7f83/dependencies.zig @@ -0,0 +1,11 @@ +pub const packages = struct { + pub const @"1220d624669f633ebe6c7afaba1a702c05c4c8e55a57b77a4d0d6ab1e3da07db11e2" = struct { + pub const build_root = "/home/rain/.cache/zig/p/1220d624669f633ebe6c7afaba1a702c05c4c8e55a57b77a4d0d6ab1e3da07db11e2"; + pub const build_zig = @import("1220d624669f633ebe6c7afaba1a702c05c4c8e55a57b77a4d0d6ab1e3da07db11e2"); + pub const deps: []const struct { []const u8, []const u8 } = &.{}; + }; +}; + +pub const root_deps: []const struct { []const u8, []const u8 } = &.{ + .{ "zlib", "1220d624669f633ebe6c7afaba1a702c05c4c8e55a57b77a4d0d6ab1e3da07db11e2" }, +}; diff --git a/example/exe/.zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 b/example/exe/.zig-cache/z/bcf15b946bf5c3c42c96c97e20c86c29 new file mode 100644 index 0000000000000000000000000000000000000000..3d76936a6922815eed03de3813dc891d50fd2beb GIT binary patch literal 4367 zcmaLZdz6%A9l-H-xnCAV0YNS~5CZ1PWyK{7VPQdBaa{tIz|duOXMlm-*=2S{VAtd- zY6>c-+=N&+NsUA#6f9GSG_u4X&MB+osSbzgP?o2Yg%y3jv+pSV)133+_dL)0+@I%t zm(xKI+?^K$AH(0$hQ8U(iPGf`1jvD=e5gJ6+hTq^6{3N8yxz zUL2bWb0y6!O)c2f(y}Y8L-nS@X7kxpq1iA+D72ew&5DwuY`$c6)%a`fn?mWRQRO~u zDr^e7+EP-Ht=}9D@qfp#;itX-Pd7F6bG~kF;Rh@^FKCB=e@zELdz7LLEIX5}69gT@ zvTnpn!}RUM%V518u&wFtm>%XoN9=OZ(ZA)zYdN!7@o~M+=)RL z8RjjMbF=+0*xvjA^ulmh=JPn5S5L&S5C!nL`5ec!ei3|T{;E(p@iR!`N)%&0+M*vO zg)v2Rty8f9`SAH5iF15K`e&-S$=kW~OmlimG>pcqVnIDXsuou>Q9w%Y_9QUm& z9M7@|*bmD+)5$o5ov>fay*DK|fEVyGMxs*~z2i6IjWE7MybX?RJPOa+@(ygG?MI`eU{1IY~`$d>EFQ_uZ?*cG4D;a z<9{p?CyggNjWa>{tt4L5{k=C8m5SVq}cT#g&zJbXR`>(M~|3S`ip z`~`j!NEeefzml|nl7EMwAsq{YzXRz zwTZ^~Cy#w#L2HGeu_jR!#NzewWGtSnUJ=BX$Af4rHf4FdI+Ko8)x?8jv^E~3>gv*! z4Rx7Rb-Z#xg3|hEdQs4jsvc1rO(cgmCKd)YiR6;o5>=^aYDExDr4tLH)oDJFbXHau z%h05@H6)VEw5Dcau1YGCtgNn$S#d@t`AKo>oXV3-JYFBLz|z)sGtIKZ1{+K?+CjDw ziGVI5=|%BKw7x#bBopb%bi5&*tvicEc9NAWxjNhGq6$`P?Zs5K8=pp6o3ro1KiqwO zhJ(8z19zTzx?}eZnG>51jb9T!%KlHG4bT1Jc%!@#p0s)SMfB_A&)encc0fmTg3oOe zfnPA+SlfB?e5;IpjUu=MW8rgeT5t5g0QlG3Sd1!E!0{Z*uhvzFU?42N220_a;~O^; zv*6d*FOzR`DvZ9ddAJT4Sne&ij^i6`?>IvdK@DPXZNuPr{`GLY0@&AZjDT$&w-DE3 zFvh`sEr#=&2#{?9^J|>|A&gEuA@DTREef4W{3!JBW z?N|R^Y=`G{BfbE~oD9Ey_EQSiG7YZ7`9$ypz61OIB4)rfTF<{Q_PrmTiFd*~REBcc z$4rdDm*8BU!cnw=?VZOwM9_@);IljNEIx$4z4!>O-E*<8=kN!3C*xRvg;)f~_OFlg z@-M;?c&4>*ttr@tWB7%1%m%nF?*kvSmBs_Gf2w5v64euz!uDx+pB$?Z?vJq;ufw@J zeg`z+9()DvS#E9a%Q`rhCCOEd^I_8tu0{473+{3TKxjh5tb{39n zbX?D3H>TqZD&X2WqZv=51@>bfd+-f-ZqFlv4`8`>@|*B(cvd^%KK>Tl(FwcoHSC6a z{v7P*Tks6`A%g>mz;)&B`?pCSgx?qI&4GRIhjZ?T7sLEZMEiIdp7pDU-~!%*dt<+= za0IKvSWNVuUVK-MQuciu!w=9ie11Rax8WMQQ4{$GgDcS&{m>r+a61O!vlxu4F$6;~2BUEUir~Eb=G+S3Bkw^4X2W|v7tZO+ z@NPtL7b-CyRj5V`33#UNy?1&!R-h4UuoA1V8f&o*58|tM2oGZiwqhH$<0*JYUV!KM z3J&2gUd2!FUA%_x;dQ)$BRGyX@fLoFAHlQmojD1A?$tmHYCd0gZpX8K-ul{wqWl9r zV}488QQo-u@cd2rV_TO0YIE(`0cT!pPnp_sES-s`@H32Pd&|c6>;F>vo4(t6_l+Oh QGm|oZZIB21GRpS<1@}2hQvd(} literal 0 HcmV?d00001 diff --git a/zlib.zig b/zlib.zig deleted file mode 100644 index e6b1bf6..0000000 --- a/zlib.zig +++ /dev/null @@ -1,58 +0,0 @@ -const std = @import("std"); -const Self = @This(); - -fn root() []const u8 { - return std.fs.path.dirname(@src().file) orelse "."; -} - -const root_path = root() ++ "/"; -const package_path = root_path ++ "src/main.zig"; -pub const include_dir = root_path ++ "zlib"; -pub const Options = struct { - import_name: ?[]const u8 = null, -}; - -pub const Library = struct { - step: *std.build.LibExeObjStep, - - pub fn link(self: Library, other: *std.build.LibExeObjStep, opts: Options) void { - other.addIncludePath(.{ .path = include_dir }); - other.linkLibrary(self.step); - - if (opts.import_name) |import_name| - other.addAnonymousModule( - import_name, - .{ .source_file = .{ .path = package_path } }, - ); - } -}; - -pub fn create(b: *std.build.Builder, target: std.zig.CrossTarget, optimize: std.builtin.OptimizeMode) Library { - const ret = b.addStaticLibrary(.{ - .name = "z", - .target = target, - .optimize = optimize, - }); - ret.linkLibC(); - ret.addCSourceFiles(.{ .files = srcs, .flags = &.{"-std=c89"} }); - - return Library{ .step = ret }; -} - -const srcs = &.{ - root_path ++ "zlib/adler32.c", - root_path ++ "zlib/compress.c", - root_path ++ "zlib/crc32.c", - root_path ++ "zlib/deflate.c", - root_path ++ "zlib/gzclose.c", - root_path ++ "zlib/gzlib.c", - root_path ++ "zlib/gzread.c", - root_path ++ "zlib/gzwrite.c", - root_path ++ "zlib/inflate.c", - root_path ++ "zlib/infback.c", - root_path ++ "zlib/inftrees.c", - root_path ++ "zlib/inffast.c", - root_path ++ "zlib/trees.c", - root_path ++ "zlib/uncompr.c", - root_path ++ "zlib/zutil.c", -};