diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | amiga/Makefile.target | 2 |
2 files changed, 15 insertions, 7 deletions
@@ -111,7 +111,7 @@ RESOURCES = ifneq ($(TARGET),riscos) ifneq ($(TARGET),gtk) ifneq ($(TARGET),beos) - ifneq ($(TARGET),amiga) + ifneq ($(findstring amiga,$(TARGET)),amiga) ifneq ($(TARGET),framebuffer) ifneq ($(TARGET),windows) ifneq ($(TARGET),atari) @@ -212,11 +212,19 @@ else PKG_CONFIG := endif else - ifeq ($(TARGET),amiga) - ifneq ($(HOST),amiga) - # TODO: We'll eventually need ppc-unknown-amigaos4, too -- how? - GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-unknown-amigaos/env - GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-unknown-amigaos/cross/bin + ifeq ($(findstring amiga,$(TARGET)),amiga) + ifneq ($(findstring amiga,$(HOST)),amiga) + ifeq ($(TARGET),amigaos3) + GCCSDK_INSTALL_ENV ?= /opt/netsurf/m68k-unknown-amigaos/env + GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/m68k-unknown-amigaos/cross/bin + + SUBTARGET = os3 + else + GCCSDK_INSTALL_ENV ?= /opt/netsurf/ppc-amigaos/env + GCCSDK_INSTALL_CROSSBIN ?= /opt/netsurf/ppc-amigaos/cross/bin + endif + + override TARGET := amiga CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) diff --git a/amiga/Makefile.target b/amiga/Makefile.target index adb072f95..d4a259665 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -2,7 +2,7 @@ # Amiga target setup # ---------------------------------------------------------------------------- -CFLAGS += -std=c99 -I . -Dnsamiga +CFLAGS += -std=c99 -I . -Dnsamiga -U__STRICT_ANSI__ NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP |