Skip to content

Commit 408080d

Browse files
committed
atari: autodetect ATARIARCH
Can still be set explicitly if needed, but the defaults are now sane.
1 parent 0e8f33e commit 408080d

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

frontends/atari/Makefile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@ STRIP := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*-strip)
1212
STACK := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*stack)
1313
FT2CF := $(GCCSDK_INSTALL_ENV)/bin/freetype-config
1414

15+
# Compute default atariarch: 68020-60 unless coldfire
16+
ifeq ($(origin ATARIARCH),undefined)
17+
ifeq (,$(findstring m5475,$(shell $(CC) -dumpmachine 2>/dev/null)))
18+
ATARIARCH := 68020-60
19+
else
20+
ATARIARCH := v4e
21+
endif
22+
endif
23+
# Validate atariarch
24+
ifeq ($(filter 68000 68020-60 v4e,$(ATARIARCH)),)
25+
$(error Unknown ATARIARCH "$(ATARIARCH)")
26+
endif
27+
1528
ifeq ($(ATARIARCH),68000)
1629
PRGSUFFIX := 000.app
1730
PKGNAME := ns000.zip

frontends/atari/Makefile.defaults

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ NETSURF_USE_ATARI_VDI_FONT := NO
3939
# Valid options: YES, NO
4040
NETSURF_USE_ATARI_8BPP_SUPPORT := NO
4141

42-
# Configure the CPU target
43-
# Valid options: 68000, 68020-60, 5475 (coldfire)
44-
ATARIARCH = 68020-60
45-
4642
# enable optimizations
4743
# -O2 is currently broken with m68000 / m68020-60 builds
4844
CFLAGS += -O3

0 commit comments

Comments
 (0)