Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/408080d5513460dc2b14d7753b50df3c87a9c6c3
...commit
http://git.netsurf-browser.org/netsurf.git/commit/408080d5513460dc2b14d7753b50df3c87a9c6c3
...tree
http://git.netsurf-browser.org/netsurf.git/tree/408080d5513460dc2b14d7753b50df3c87a9c6c3
The branch, master has been updated
via 408080d5513460dc2b14d7753b50df3c87a9c6c3 (commit)
from 0e8f33ecf1c6cd7bf517c9880be86b0326bf575a (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/commit/?id=408080d5513460dc2b14d7753b50df3c87a9c6c3
commit 408080d5513460dc2b14d7753b50df3c87a9c6c3
Author: John-Mark Bell <[email protected]>
Commit: John-Mark Bell <[email protected]>
atari: autodetect ATARIARCH
Can still be set explicitly if needed, but the defaults are now
sane.
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 2f6d7118b..a14e202e1 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -12,6 +12,19 @@ STRIP := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*-strip)
STACK := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*stack)
FT2CF := $(GCCSDK_INSTALL_ENV)/bin/freetype-config
+# Compute default atariarch: 68020-60 unless coldfire
+ifeq ($(origin ATARIARCH),undefined)
+ ifeq (,$(findstring m5475,$(shell $(CC) -dumpmachine 2>/dev/null)))
+ ATARIARCH := 68020-60
+ else
+ ATARIARCH := v4e
+ endif
+endif
+# Validate atariarch
+ifeq ($(filter 68000 68020-60 v4e,$(ATARIARCH)),)
+ $(error Unknown ATARIARCH "$(ATARIARCH)")
+endif
+
ifeq ($(ATARIARCH),68000)
PRGSUFFIX := 000.app
PKGNAME := ns000.zip
diff --git a/frontends/atari/Makefile.defaults
b/frontends/atari/Makefile.defaults
index dd040540f..7c400e159 100644
--- a/frontends/atari/Makefile.defaults
+++ b/frontends/atari/Makefile.defaults
@@ -39,10 +39,6 @@ NETSURF_USE_ATARI_VDI_FONT := NO
# Valid options: YES, NO
NETSURF_USE_ATARI_8BPP_SUPPORT := NO
-# Configure the CPU target
-# Valid options: 68000, 68020-60, 5475 (coldfire)
-ATARIARCH = 68020-60
-
# enable optimizations
# -O2 is currently broken with m68000 / m68020-60 builds
CFLAGS += -O3
-----------------------------------------------------------------------
Summary of changes:
frontends/atari/Makefile | 13 +++++++++++++
frontends/atari/Makefile.defaults | 4 ----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/frontends/atari/Makefile b/frontends/atari/Makefile
index 2f6d7118b..a14e202e1 100644
--- a/frontends/atari/Makefile
+++ b/frontends/atari/Makefile
@@ -12,6 +12,19 @@ STRIP := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*-strip)
STACK := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*stack)
FT2CF := $(GCCSDK_INSTALL_ENV)/bin/freetype-config
+# Compute default atariarch: 68020-60 unless coldfire
+ifeq ($(origin ATARIARCH),undefined)
+ ifeq (,$(findstring m5475,$(shell $(CC) -dumpmachine 2>/dev/null)))
+ ATARIARCH := 68020-60
+ else
+ ATARIARCH := v4e
+ endif
+endif
+# Validate atariarch
+ifeq ($(filter 68000 68020-60 v4e,$(ATARIARCH)),)
+ $(error Unknown ATARIARCH "$(ATARIARCH)")
+endif
+
ifeq ($(ATARIARCH),68000)
PRGSUFFIX := 000.app
PKGNAME := ns000.zip
diff --git a/frontends/atari/Makefile.defaults
b/frontends/atari/Makefile.defaults
index dd040540f..7c400e159 100644
--- a/frontends/atari/Makefile.defaults
+++ b/frontends/atari/Makefile.defaults
@@ -39,10 +39,6 @@ NETSURF_USE_ATARI_VDI_FONT := NO
# Valid options: YES, NO
NETSURF_USE_ATARI_8BPP_SUPPORT := NO
-# Configure the CPU target
-# Valid options: 68000, 68020-60, 5475 (coldfire)
-ATARIARCH = 68020-60
-
# enable optimizations
# -O2 is currently broken with m68000 / m68020-60 builds
CFLAGS += -O3
--
NetSurf Browser
