From 112ddd152132557c5c92cd01e98f7315cba0fdf1 Mon Sep 17 00:00:00 2001 From: NishiOwO Date: Sun, 29 Mar 2026 09:36:30 +0900 Subject: [PATCH] fix libpng/libjpeg, enable zlib --- configure | 3 ++- pl/ostype/NetBSD.pl | 2 +- pl/rules.pl | 7 +++++++ pl/utils.pl | 7 +++++++ 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cb46537..edde7b9 100755 --- a/configure +++ b/configure @@ -14,6 +14,7 @@ our $prefix = "/usr/local"; our $cc = defined($ENV{CC}) ? $ENV{CC} : "*host*gcc"; our $ar = defined($ENV{AR}) ? $ENV{AR} : "*host*ar"; our $incdir = "-I include"; +our $incdir2 = ""; our $cflags = "-fPIC -D_MILSKO"; our $libdir = ""; our $ldflags = ""; @@ -168,7 +169,7 @@ open(OUT, ">", "Makefile"); print(OUT "PREFIX = ${prefix}\n"); print(OUT "AR = ${ar}\n"); print(OUT "CC = ${cc}\n"); -print(OUT "INCDIR = ${incdir}\n"); +print(OUT "INCDIR = ${incdir} ${incdir2}\n"); print(OUT "CFLAGS = ${cflags}\n"); print(OUT "LIBDIR = ${libdir}\n"); print(OUT "LDFLAGS = ${ldflags}\n"); diff --git a/pl/ostype/NetBSD.pl b/pl/ostype/NetBSD.pl index 0eec106..9367250 100644 --- a/pl/ostype/NetBSD.pl +++ b/pl/ostype/NetBSD.pl @@ -1,4 +1,4 @@ -add_incdir("-I/usr/X11R7/include -I/usr/pkg/include"); +add_incdir2("-I/usr/X11R7/include -I/usr/pkg/include"); add_libdir( "-L/usr/X11R7/lib -Wl,-R/usr/X11R7/lib -L/usr/pkg/lib -Wl,-R/usr/pkg/lib"); use_backend("x11"); diff --git a/pl/rules.pl b/pl/rules.pl index bbe6794..36b7f36 100644 --- a/pl/rules.pl +++ b/pl/rules.pl @@ -64,11 +64,17 @@ if (grep(/^cocoa$/, @backends)) { if (param_get("stb-image")) { add_cflags("-DUSE_STB_IMAGE"); +}else{ + new_object("external/libjpeg/src/*.c"); + new_object("external/libpng/src/*.c"); + add_incdir("-Iexternal/libjpeg/include -Iexternal/libpng/include"); } if (param_get("stb-truetype")) { add_cflags("-DUSE_STB_TRUETYPE"); } +add_incdir("-Iexternal/libz/include"); + if (param_get("freetype2")) { add_cflags("-DUSE_FREETYPE2"); if ($cross) { @@ -121,6 +127,7 @@ new_object("src/dialog/*.c"); new_object("src/abstract/*.c"); new_object("external/*.c"); +new_object("external/libz/src/*.c"); new_example("examples/basic/example"); new_example("examples/basic/rotate"); diff --git a/pl/utils.pl b/pl/utils.pl index ce738fc..70c0b51 100644 --- a/pl/utils.pl +++ b/pl/utils.pl @@ -5,6 +5,13 @@ sub add_incdir { $incdir = "${incdir} ${input}"; } +sub add_incdir2 { + my $input = $_[0]; + $input =~ s/\r?\n/ /g; + + $incdir2 = "${incdir2} ${input}"; +} + sub add_cflags { my $input = $_[0]; $input =~ s/\r?\n/ /g;