Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Apr 18, 2026. It is now read-only.

Commit 18339bc

Browse files
robrykrobryk
committed
Do not depend on pkg-config.
Some systems do not have it by default; let's use libpng-config if pkg-config is unavailable. Fixes #110.
1 parent bd414a0 commit 18339bc

3 files changed

Lines changed: 16 additions & 16 deletions

File tree

‎guetzli.make‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ifeq ($(config),release)
1919
INCLUDES += -I. -Ithird_party/butteraugli
2020
FORCE_INCLUDE +=
2121
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
22-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -g `pkg-config --cflags libpng`
23-
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -g -std=c++11 `pkg-config --cflags libpng`
22+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -g `pkg-config --cflags libpng || libpng-config --cflags`
23+
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -g -std=c++11 `pkg-config --cflags libpng || libpng-config --cflags`
2424
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
2525
LIBS +=
2626
LDDEPS +=
27-
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --libs libpng`
27+
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --libs libpng || libpng-config --ldflags`
2828
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
2929
define PREBUILDCMDS
3030
endef
@@ -46,12 +46,12 @@ ifeq ($(config),debug)
4646
INCLUDES += -I. -Ithird_party/butteraugli
4747
FORCE_INCLUDE +=
4848
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
49-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g `pkg-config --cflags libpng`
50-
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++11 `pkg-config --cflags libpng`
49+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g `pkg-config --cflags libpng || libpng-config --cflags`
50+
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++11 `pkg-config --cflags libpng || libpng-config --cflags`
5151
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
5252
LIBS +=
5353
LDDEPS +=
54-
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --libs libpng`
54+
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --libs libpng || libpng-config --ldflags`
5555
LINKCMD = $(CXX) -o "$@" $(OBJECTS) $(RESOURCES) $(ALL_LDFLAGS) $(LIBS)
5656
define PREBUILDCMDS
5757
endef

‎guetzli_static.make‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ ifeq ($(config),release)
1919
INCLUDES += -I. -Ithird_party/butteraugli
2020
FORCE_INCLUDE +=
2121
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
22-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -g `pkg-config --static --cflags libpng`
23-
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -g -std=c++11 `pkg-config --static --cflags libpng`
22+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O3 -g `pkg-config --static --cflags libpng || libpng-config --static --cflags`
23+
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O3 -g -std=c++11 `pkg-config --static --cflags libpng || libpng-config --static --cflags`
2424
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
2525
LIBS +=
2626
LDDEPS +=
27-
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --static --libs libpng`
27+
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --static --libs libpng || libpng-config --static --ldflags`
2828
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
2929
define PREBUILDCMDS
3030
endef
@@ -46,12 +46,12 @@ ifeq ($(config),debug)
4646
INCLUDES += -I. -Ithird_party/butteraugli
4747
FORCE_INCLUDE +=
4848
ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
49-
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g `pkg-config --static --cflags libpng`
50-
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++11 `pkg-config --static --cflags libpng`
49+
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g `pkg-config --static --cflags libpng || libpng-config --static --cflags`
50+
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g -std=c++11 `pkg-config --static --cflags libpng || libpng-config --static --cflags`
5151
ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
5252
LIBS +=
5353
LDDEPS +=
54-
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --static --libs libpng`
54+
ALL_LDFLAGS += $(LDFLAGS) `pkg-config --static --libs libpng || libpng-config --static --ldflags`
5555
LINKCMD = $(AR) -rcs "$@" $(OBJECTS)
5656
define PREBUILDCMDS
5757
endef

‎premake5.lua‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ workspace "guetzli"
3333
}
3434
removefiles "guetzli/guetzli.cc"
3535
filter "action:gmake"
36-
linkoptions { "`pkg-config --static --libs libpng`" }
37-
buildoptions { "`pkg-config --static --cflags libpng`" }
36+
linkoptions { "`pkg-config --static --libs libpng || libpng-config --static --ldflags`" }
37+
buildoptions { "`pkg-config --static --cflags libpng || libpng-config --static --cflags`" }
3838

3939
project "guetzli"
4040
kind "ConsoleApp"
4141
filter "action:gmake"
42-
linkoptions { "`pkg-config --libs libpng`" }
43-
buildoptions { "`pkg-config --cflags libpng`" }
42+
linkoptions { "`pkg-config --libs libpng || libpng-config --ldflags`" }
43+
buildoptions { "`pkg-config --cflags libpng || libpng-config --cflags`" }
4444
filter "action:vs*"
4545
links { "shlwapi" }
4646
filter {}

0 commit comments

Comments
 (0)