diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-07-23 22:31:12 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2012-07-23 22:31:12 +0100 |
| commit | 0bbe65de26180079f70de0d7f4b6ee1eaaf54293 (patch) | |
| tree | 6a132413b1b26cf8fede3018c00094b2b58b4139 /Makefile | |
| parent | 773cbd2aea9e0dd1375f1619d1938b625e00d85b (diff) | |
| parent | 3faaff91ac61b6a0906dd94a3f9455e31d4d6b43 (diff) | |
| download | netsurf-0bbe65de26180079f70de0d7f4b6ee1eaaf54293.tar.gz netsurf-0bbe65de26180079f70de0d7f4b6ee1eaaf54293.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -207,12 +207,13 @@ else ifeq ($(TARGET),windows) ifneq ($(HOST),windows) # Set Mingw defaults - MINGW_PREFIX ?= i586-mingw32msvc- - MINGW_INSTALL_ENV ?= /usr/i586-mingw32msvc/ + GCCSDK_INSTALL_ENV ?= /opt/netsurf/i686-w64-mingw32/env + GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/i686-w64-mingw32/cross/bin - # mingw cross-compile - CC := $(MINGW_PREFIX)gcc - PKG_CONFIG := $(MINGW_INSTALL_ENV)/bin/pkg-config + CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) + WINDRES := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres) + + PKG_CONFIG := PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config else # Building on Windows CC := gcc |