diff options
| author | John Tytgat <joty@netsurf-browser.org> | 2007-12-28 15:43:57 +0000 |
|---|---|---|
| committer | John Tytgat <joty@netsurf-browser.org> | 2007-12-28 15:43:57 +0000 |
| commit | 76416f1964c214fba408f3cdf15cf4935fec0252 (patch) | |
| tree | eaa909cccb9c459aa14ff42f4cc8217805600e3f | |
| parent | 13b91169fde0fce632bb6d762b87353adb536aa7 (diff) | |
| download | netsurf-76416f1964c214fba408f3cdf15cf4935fec0252.tar.gz netsurf-76416f1964c214fba408f3cdf15cf4935fec0252.tar.bz2 | |
GCCSDK 4 build support.
svn path=/trunk/netsurf/; revision=3674
| -rw-r--r-- | makefile | 6 | ||||
| -rw-r--r-- | posix.mk | 5 |
2 files changed, 6 insertions, 5 deletions
@@ -73,11 +73,11 @@ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \ gtk_download.o # gtk/ -OBJDIR_RISCOS = arm-riscos-aof +OBJDIR_RISCOS = $(shell $(CC) -dumpmachine) SOURCES_RISCOS=$(OBJECTS_RISCOS:.o=.c) OBJS_RISCOS=$(OBJECTS_RISCOS:%.o=$(OBJDIR_RISCOS)/%.o) -OBJDIR_RISCOS_SMALL = arm-riscos-aof-small +OBJDIR_RISCOS_SMALL = $(shell $(CC) -dumpmachine)-small SOURCES_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:.o=.c) OBJS_RISCOS_SMALL=$(OBJECTS_RISCOS_SMALL:%.o=$(OBJDIR_RISCOS_SMALL)/%.o) @@ -140,7 +140,7 @@ CFLAGS_GTK += -U__STRICT_ANSI__ endif endif -AFLAGS_RISCOS = -I..,. $(PLATFORM_AFLAGS_RISCOS) +AFLAGS_RISCOS = -xassembler-with-cpp $(PLATFORM_AFLAGS_RISCOS) AFLAGS_RISCOS_SMALL = $(AFLAGS_RISCOS) -Dsmall # targets @@ -1,9 +1,10 @@ GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin GCCSDK_INSTALL_ENV ?= /home/riscos/env -CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc CC_DEBUG = /usr/bin/gcc -ASM = $(GCCSDK_INSTALL_CROSSBIN)/gcc +# The wildcard rule matches on 'gcc' (GCCSDK 3.4) or 'arm-unknown-riscos-gcc' (GCCSDK 4) +CC = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) +ASM = $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc) PLATFORM_CFLAGS_RISCOS = -I$(GCCSDK_INSTALL_ENV)/include \ -I$(GCCSDK_INSTALL_ENV)/include/libxml2 \ |