Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/ae7d1141012c438c1ec101747038f83c9db33d7a
...commit
http://git.netsurf-browser.org/netsurf.git/commit/ae7d1141012c438c1ec101747038f83c9db33d7a
...tree
http://git.netsurf-browser.org/netsurf.git/tree/ae7d1141012c438c1ec101747038f83c9db33d7a
The branch, master has been updated
via ae7d1141012c438c1ec101747038f83c9db33d7a (commit)
from 82fe8989aefa072215d223cf92a1a1e7e7e7228a (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/netsurf.git/commitdiff/ae7d1141012c438c1ec101747038f83c9db33d7a
commit ae7d1141012c438c1ec101747038f83c9db33d7a
Author: John-Mark Bell <j...@netsurf-browser.org>
Commit: John-Mark Bell <j...@netsurf-browser.org>
Plumbing for Atari cross-compilation
diff --git a/Makefile b/Makefile
index 22212a4..d51936f 100644
--- a/Makefile
+++ b/Makefile
@@ -241,8 +241,25 @@ else
ifeq ($(TARGET),cocoa)
PKG_CONFIG :=
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):/usr/local/lib/pkgconfig" pkg-config
else
- # Building for GTK, Framebuffer, Atari
- PKG_CONFIG := pkg-config
+ ifeq ($(TARGET),atari)
+ ifeq ($(HOST),atari)
+ PKG_CONFIG := pkg-config
+ else
+ ifeq ($(HOST),mint)
+ PKG_CONFIG := pkg-config
+ else
+ GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env
+ GCCSDK_INSTALL_CROSSBIN ?=
/opt/netsurf/m68k-atari-mint/cross/bin
+
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+
+ PKG_CONFIG :=
PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config
+ endif
+ endif
+ else
+ # Building for GTK, Framebuffer
+ PKG_CONFIG := pkg-config
+ endif
endif
endif
endif
-----------------------------------------------------------------------
Summary of changes:
Makefile | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 22212a4..d51936f 100644
--- a/Makefile
+++ b/Makefile
@@ -241,8 +241,25 @@ else
ifeq ($(TARGET),cocoa)
PKG_CONFIG :=
PKG_CONFIG_PATH="$(PKG_CONFIG_PATH):/usr/local/lib/pkgconfig" pkg-config
else
- # Building for GTK, Framebuffer, Atari
- PKG_CONFIG := pkg-config
+ ifeq ($(TARGET),atari)
+ ifeq ($(HOST),atari)
+ PKG_CONFIG := pkg-config
+ else
+ ifeq ($(HOST),mint)
+ PKG_CONFIG := pkg-config
+ else
+ GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-atari-mint/env
+ GCCSDK_INSTALL_CROSSBIN ?=
/opt/netsurf/m68k-atari-mint/cross/bin
+
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+
+ PKG_CONFIG :=
PKG_CONFIG_LIBDIR="$(GCCSDK_INSTALL_ENV)/lib/pkgconfig" pkg-config
+ endif
+ endif
+ else
+ # Building for GTK, Framebuffer
+ PKG_CONFIG := pkg-config
+ endif
endif
endif
endif
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
netsurf-commits@netsurf-browser.org
http://vlists.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
