Gitweb links:
...log
http://git.netsurf-browser.org/buildsystem.git/shortlog/37c5c61657cd9b625bc43e6427f07968d974fd93
...commit
http://git.netsurf-browser.org/buildsystem.git/commit/37c5c61657cd9b625bc43e6427f07968d974fd93
...tree
http://git.netsurf-browser.org/buildsystem.git/tree/37c5c61657cd9b625bc43e6427f07968d974fd93
The branch, master has been updated
via 37c5c61657cd9b625bc43e6427f07968d974fd93 (commit)
from 1bf565c3dc56265e1278e24d8ad7427867c026b5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/buildsystem.git/commitdiff/37c5c61657cd9b625bc43e6427f07968d974fd93
commit 37c5c61657cd9b625bc43e6427f07968d974fd93
Author: Vincent Sanders <vi...@kyllikki.org>
Commit: Vincent Sanders <vi...@kyllikki.org>
update windows buildtools to use our mingw toolchain build
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index c501cf8..5e7a5f7 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -237,22 +237,42 @@ ifeq ($(TARGET),windows)
PKGCONFIG ?=
else
# Cross compiling for Windows -- assumes mingw toolchain
- MINGW_INSTALL_ENV ?= /usr/local/mingw
- CC__ := i586-mingw32msvc-gcc
- CXX__ := i586-mingw32msvc-g++
- AR__ := i586-mingw32msvc-ar
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/i686-w64-mingw32/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/i686-w64-mingw32/env
+ else
+ GCCSDK_INSTALL_ENV := /usr/local/mingw
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/i686-w64-mingw32/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/i686-w64-mingw32/cross/bin
+ AR__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+ CC__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ CXX__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
+ else
+ GCCSDK_INSTALL_CROSSBIN := /usr/local/mingw/bin
+ CC__ := i586-mingw32msvc-gcc
+ CXX__ := i586-mingw32msvc-g++
+ AR__ := i586-mingw32msvc-ar
+ endif
+ endif
+
+ GENHTML ?= echo
+ LCOV ?= echo
+ PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
- PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/share/pkgconfig"
pkg-config
endif
# TODO: this assumes GCC
- 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
+ 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
# Default prefix
- PREFIX ?= $(MINGW_INSTALL_ENV)
+ PREFIX ?= $(GCCSDK_INSTALL_ENV)
endif
# AmigaOS (3/4; m68k/ppc: we can treat them identically)
-----------------------------------------------------------------------
Summary of changes:
makefiles/Makefile.tools | 38 +++++++++++++++++++++++++++++---------
1 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index c501cf8..5e7a5f7 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -237,22 +237,42 @@ ifeq ($(TARGET),windows)
PKGCONFIG ?=
else
# Cross compiling for Windows -- assumes mingw toolchain
- MINGW_INSTALL_ENV ?= /usr/local/mingw
- CC__ := i586-mingw32msvc-gcc
- CXX__ := i586-mingw32msvc-g++
- AR__ := i586-mingw32msvc-ar
+ ifeq ($(origin GCCSDK_INSTALL_ENV),undefined)
+ ifneq ($(realpath /opt/netsurf/i686-w64-mingw32/env),)
+ GCCSDK_INSTALL_ENV := /opt/netsurf/i686-w64-mingw32/env
+ else
+ GCCSDK_INSTALL_ENV := /usr/local/mingw
+ endif
+ endif
+
+ ifeq ($(origin GCCSDK_INSTALL_CROSSBIN),undefined)
+ ifneq ($(realpath /opt/netsurf/i686-w64-mingw32/cross/bin),)
+ GCCSDK_INSTALL_CROSSBIN := /opt/netsurf/i686-w64-mingw32/cross/bin
+ AR__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+ CC__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ CXX__ := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)
+ else
+ GCCSDK_INSTALL_CROSSBIN := /usr/local/mingw/bin
+ CC__ := i586-mingw32msvc-gcc
+ CXX__ := i586-mingw32msvc-g++
+ AR__ := i586-mingw32msvc-ar
+ endif
+ endif
+
+ GENHTML ?= echo
+ LCOV ?= echo
+ PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/lib/pkgconfig:$(GCCSDK_INSTALL_ENV)/share/pkgconfig"
pkg-config
- PKGCONFIG ?=
PKG_CONFIG_LIBDIR="$(PREFIX)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/lib/pkgconfig:$(MINGW_INSTALL_ENV)/share/pkgconfig"
pkg-config
endif
# TODO: this assumes GCC
- 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
+ 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
# Default prefix
- PREFIX ?= $(MINGW_INSTALL_ENV)
+ PREFIX ?= $(GCCSDK_INSTALL_ENV)
endif
# AmigaOS (3/4; m68k/ppc: we can treat them identically)
--
NetSurf Project build system
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
