quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fedora support patch by maci (make DLL finding work with Fedora's mingw)

Browse Source
This commit is contained in:
Rudolf Polzer 2013-01-14 21:21:37 +01:00
parent 590aae45b1
commit 0fbfb4bcc9
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -97,6 +97,7 @@ endif
# these are used on Win32 only # these are used on Win32 only
GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL)) GTKDIR ?= $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKGCONFIG) gtk+-2.0 --variable=prefix $(STDERR_TO_DEVNULL))
WHICHDLL ?= which WHICHDLL ?= which
DLLINSTALL ?= install-dlls.sh
# alias mingw32 OSes # alias mingw32 OSes
ifeq ($(OS),MINGW32_NT-6.0) ifeq ($(OS),MINGW32_NT-6.0)
@ -1031,7 +1032,7 @@ install-data: binaries
.PHONY: install-dll .PHONY: install-dll
ifeq ($(OS),Win32) ifeq ($(OS),Win32)
install-dll: binaries 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 else
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)
install-dll: binaries install-dll: binaries

4
mingw-fedora-Makefile.conf
View File

@ -4,10 +4,14 @@
# how to call the mingw tools # how to call the mingw tools
MINGW_TARGET_ARCH=i686 MINGW_TARGET_ARCH=i686
#MINGW_TARGET_ARCH=x86_64
MINGW_EXEC_PREFIX = $(MINGW_TARGET_ARCH)-w64-mingw32- MINGW_EXEC_PREFIX = $(MINGW_TARGET_ARCH)-w64-mingw32-
# use custom pkg-config # use custom pkg-config
PKGCONFIG = $(MINGW_EXEC_PREFIX)pkg-config PKGCONFIG = $(MINGW_EXEC_PREFIX)pkg-config
# use custom dll install script
DLLINSTALL = install-dlls-fedora.sh
# use mingw32 # use mingw32
include mingw-Makefile.inc include mingw-Makefile.inc