diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2010-01-24 11:07:41 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2010-01-24 11:07:41 +0000 |
| commit | ca7bee0100db219771644dc78fea965eba43ca34 (patch) | |
| tree | b470deb69dc95e96d21e5752918b28f59bdc09d1 /makefiles/Makefile.tools | |
| parent | 6a8abe1a91e0ca25fa3cbec2a2ab4b3ff7bb6538 (diff) | |
| download | buildsystem-ca7bee0100db219771644dc78fea965eba43ca34.tar.gz buildsystem-ca7bee0100db219771644dc78fea965eba43ca34.tar.bz2 | |
Use MINGW_INSTALL_ENV, not GCCSDK_INSTALL_ENV when targetting windows.
This avoids potential build environment confusion.
svn path=/trunk/tools/buildsystem/; revision=9879
Diffstat (limited to 'makefiles/Makefile.tools')
| -rw-r--r-- | makefiles/Makefile.tools | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools index 3b87a07..072d299 100644 --- a/makefiles/Makefile.tools +++ b/makefiles/Makefile.tools @@ -165,21 +165,21 @@ ifeq ($(TARGET),windows) $(error Compiling on Windows is not supported) else # Cross compiling for Windows -- assumes mingw toolchain - GCCSDK_INSTALL_ENV ?= /usr/local/mingw + MINGW_INSTALL_ENV ?= /usr/local/mingw CC__ := i586-mingw32msvc-gcc CXX__ := i586-mingw32msvc-g++ AR__ := i586-mingw32msvc-ar - PKGCONFIG ?= $(GCCSDK_INSTALL_ENV)/bin/win-pkg-config + PKGCONFIG ?= $(MINGW_INSTALL_ENV)/bin/win-pkg-config endif - CFLAGS := $(CFLAGS) -U__STRICT_ANSI__ -I$(GCCSDK_INSTALL_ENV)/include - CXXFLAGS := $(CXXFLAGS) -U__STRICT_ANSI__ -I$(GCCSDK_INSTALL_ENV)/include - LDFLAGS := $(LDFLAGS) -L$(GCCSDK_INSTALL_ENV)/lib + CFLAGS := $(CFLAGS) -U__STRICT_ANSI__ -I$(MINGW_INSTALL_ENV)/include + CXXFLAGS := $(CXXFLAGS) -U__STRICT_ANSI__ -I$(MINGW_INSTALL_ENV)/include + LDFLAGS := $(LDFLAGS) -L$(MINGW_INSTALL_ENV)/lib # Default prefix - PREFIX ?= $(GCCSDK_INSTALL_ENV) + PREFIX ?= $(MINGW_INSTALL_ENV) endif ############################################################################### |