fix libpng/libjpeg, enable zlib

This commit is contained in:
Nishi 2026-03-29 09:36:30 +09:00
commit 112ddd1521
Signed by: nishi
GPG key ID: 27EF69B208EB9343
4 changed files with 17 additions and 2 deletions

3
configure vendored
View file

@ -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");

View file

@ -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");

View file

@ -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");

View file

@ -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;