summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOle Loots <ole@monochrom.net>2013-01-05 13:19:09 +0100
committerOle Loots <ole@monochrom.net>2013-01-05 13:19:09 +0100
commit82a376a6d0d3cba03d0f11b1a332c99f61b1fd8a (patch)
treed0258a5e83eeab12c9afa6d1797da834e2a5e687
parent9fdd190e008b86cc92abb41bb659d74161062369 (diff)
downloadnetsurf-82a376a6d0d3cba03d0f11b1a332c99f61b1fd8a.tar.gz
netsurf-82a376a6d0d3cba03d0f11b1a332c99f61b1fd8a.tar.bz2
Bring netsurf frontend arch and buildsystem arch in sync.
Previously, the frontend used ATARI_ARCH for output package configuration, this is now changed to ATARIARCH.
-rw-r--r--atari/Makefile.defaults2
-rw-r--r--atari/Makefile.target6
2 files changed, 4 insertions, 4 deletions
diff --git a/atari/Makefile.defaults b/atari/Makefile.defaults
index 155ba8d2d..a8b1857df 100644
--- a/atari/Makefile.defaults
+++ b/atari/Makefile.defaults
@@ -38,7 +38,7 @@
# Configure the CPU target
# Valid options: 68000, 68020-60, 5475 (coldfire)
- ATARI_ARCH = 68020-60
+ ATARIARCH = 68020-60
# enable optimizations
# -O2 is currently broken with m68000 / m68020-60 builds
diff --git a/atari/Makefile.target b/atari/Makefile.target
index fdd4ee48f..e8c51f0ea 100644
--- a/atari/Makefile.target
+++ b/atari/Makefile.target
@@ -11,19 +11,19 @@
STRIP := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*strip)
STACK := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*stack)
-ifeq ($(ATARI_ARCH),68000)
+ifeq ($(ATARIARCH),68000)
PRGSUFFIX := 000.app
PKGNAME := ns000.zip
endif
-ifeq ($(ATARI_ARCH),68020-60)
+ifeq ($(ATARIARCH),68020-60)
CFLAGS += -m68020-60
LDFLAGS += -m68020-60
PRGSUFFIX := 020.app
PKGNAME := ns020.zip
endif
-ifeq ($(ATARI_ARCH),5475)
+ifeq ($(ATARIARCH),v4e)
CFLAGS += -mcpu=5475
LDFLAGS += -mcpu=5475
PRGSUFFIX := v4e.app