From 0fbfb4bcc94aed85d84b880a8caf9be456eebbfa Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 14 Jan 2013 21:21:37 +0100 Subject: [PATCH] Fedora support patch by maci (make DLL finding work with Fedora's mingw) --- Makefile | 3 ++- mingw-fedora-Makefile.conf | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e92030f7..b4174339 100644 --- a/Makefile +++ b/Makefile @@ -97,6 +97,7 @@ endif # these are used on Win32 only GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL)) WHICHDLL ?= which +DLLINSTALL ?= install-dlls.sh # alias mingw32 OSes ifeq ($(OS),MINGW32_NT-6.0) @@ -1031,7 +1032,7 @@ install-data: binaries .PHONY: install-dll ifeq ($(OS),Win32) install-dll: binaries - MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) install-dlls.sh + MKDIR="$(MKDIR)" CP="$(CP)" CAT="$(CAT)" GTKDIR="$(GTKDIR)" WHICHDLL="$(WHICHDLL)" INSTALLDIR="$(INSTALLDIR)" $(SH) $(DLLINSTALL) else ifeq ($(OS),Darwin) install-dll: binaries diff --git a/mingw-fedora-Makefile.conf b/mingw-fedora-Makefile.conf index 559de965..d957d4d5 100644 --- a/mingw-fedora-Makefile.conf +++ b/mingw-fedora-Makefile.conf @@ -4,10 +4,14 @@ # how to call the mingw tools MINGW_TARGET_ARCH=i686 +#MINGW_TARGET_ARCH=x86_64 MINGW_EXEC_PREFIX = $(MINGW_TARGET_ARCH)-w64-mingw32- # use custom pkg-config PKGCONFIG = $(MINGW_EXEC_PREFIX)pkg-config +# use custom dll install script +DLLINSTALL = install-dlls-fedora.sh + # use mingw32 include mingw-Makefile.inc -- 2.39.2