aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndreas Rönnquist <unknown>2020-07-28 14:28:46 +1000
committerAndreas Rönnquist <unknown>2020-07-28 14:28:46 +1000
commit444ed0ec86ac0d10dab59146904c421a2f6f4932 (patch)
treec3f4948cd80f099640722cd531081ed948609dc3
parent6ba506fe9236027a5d4606b2498f90c935c66e46 (diff)
downloadscintilla-mirror-444ed0ec86ac0d10dab59146904c421a2f6f4932.tar.gz
Bug [#2189]. Allow cross-building for GTK by choosing pkg-config.
-rw-r--r--doc/ScintillaHistory.html4
-rw-r--r--gtk/makefile5
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 564ebf7eb..a4eab4c5d 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -580,6 +580,10 @@
Fix position of marker symbols for SC_MARGIN_RTEXT which were being moved based on
width of text.
</li>
+ <li>
+ Allow cross-building for GTK by choosing pkg-config.
+ <a href="https://sourceforge.net/p/scintilla/bugs/2189/">Bug #2189</a>.
+ </li>
</ul>
<h3>
<a href="https://www.scintilla.org/scite444.zip">Release 4.4.4</a>
diff --git a/gtk/makefile b/gtk/makefile
index 987a550a8..6724f7ae0 100644
--- a/gtk/makefile
+++ b/gtk/makefile
@@ -39,6 +39,7 @@ BASE_FLAGS += -fsanitize=$(SANITIZE)
endif
ARFLAGS = rc
RANLIB ?= ranlib
+PKG_CONFIG ?= pkg-config
GTK_VERSION = $(if $(GTK3),gtk+-3.0,gtk+-2.0)
@@ -88,8 +89,8 @@ BASE_FLAGS += $(if $(DEBUG),-g,-Os)
CXX_BASE_FLAGS =--std=c++17 $(BASE_FLAGS)
CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS) $(CONFIG_FLAGS)
-CONFIG_FLAGS:=$(shell pkg-config --cflags $(GTK_VERSION))
-CONFIGLIB:=$(shell pkg-config --libs $(GTK_VERSION) gmodule-no-export-2.0)
+CONFIG_FLAGS:=$(shell $(PKG_CONFIG) --cflags $(GTK_VERSION))
+CONFIGLIB:=$(shell $(PKG_CONFIG) --libs $(GTK_VERSION) gmodule-no-export-2.0)
MARSHALLER=scintilla-marshal.o
all: $(COMPLIB) $(COMPONENT) $(LEXILLA)