summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2012-07-23 21:12:19 +0100
committerVincent Sanders <vince@kyllikki.org>2012-07-23 21:12:19 +0100
commit3faaff91ac61b6a0906dd94a3f9455e31d4d6b43 (patch)
tree5473d0e5ae22f416c44c5f5a7752472dbf8fa9f4 /Makefile
parent8a6f63fca3cf5dfd4828fc2152df67fe1963e357 (diff)
downloadnetsurf-3faaff91ac61b6a0906dd94a3f9455e31d4d6b43.tar.gz
netsurf-3faaff91ac61b6a0906dd94a3f9455e31d4d6b43.tar.bz2
change to use netsurf toolchain build
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index d51936fbb..087fa69bb 100644
--- a/Makefile
+++ b/Makefile
@@ -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