summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2008-09-28 20:35:57 (GMT)
committer John Tytgat <joty@netsurf-browser.org>2008-09-28 20:35:57 (GMT)
commite32462efb87f60c00c2b487cd019ba4193388ab2 (patch)
tree20e44d5bd98db5f42fdc18224796527f3f122aa1
parent7944e8a06896097c9923c2c6659ff2ffa28c4191 (diff)
downloadlibsvgtiny-e32462efb87f60c00c2b487cd019ba4193388ab2.tar.gz
libsvgtiny-e32462efb87f60c00c2b487cd019ba4193388ab2.tar.bz2
GCCSDK 4 build compatibility (not finished yet)
svn path=/trunk/libsvgtiny/; revision=5458
-rw-r--r--makefile40
1 files changed, 20 insertions, 20 deletions
diff --git a/makefile b/makefile
index 582a93b..89b83ae 100644
--- a/makefile
+++ b/makefile
@@ -16,30 +16,30 @@ ARFLAGS = cr
INSTALL = install
ifeq ($(TARGET),riscos)
-GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
-GCCSDK_INSTALL_ENV ?= /home/riscos/env
-CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
-AR = $(GCCSDK_INSTALL_CROSSBIN)/ar
-CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include \
+ GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+ GCCSDK_INSTALL_ENV ?= /home/riscos/env
+ CC := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)
+ AR := $(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)
+ CFLAGS += -Driscos -mpoke-function-name -I$(GCCSDK_INSTALL_ENV)/include \
-I$(GCCSDK_INSTALL_ENV)/include/libxml2
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+ LIBS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz
+ ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elf-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
+ PREFIX = $(GCCSDK_INSTALL_ENV)
else
-CFLAGS += -g `xml2-config --cflags` -fgnu89-inline
-LIBS = `xml2-config --libs`
-PREFIX = /usr/local
+ CFLAGS += -g `xml2-config --cflags` -fgnu89-inline
+ LIBS = `xml2-config --libs`
+ PREFIX = /usr/local
endif
-ifeq ($(TARGET),)
-OBJDIR = objects
-LIBDIR = lib
-BINDIR = bin
-else
-OBJDIR = $(TARGET)-objects
-LIBDIR = $(TARGET)-lib
-BINDIR = $(TARGET)-bin
-endif
+OBJDIR = $(TARGET)$(SUBTARGET)objects
+LIBDIR = $(TARGET)$(SUBTARGET)lib
+BINDIR = $(TARGET)$(SUBTARGET)bin
OBJS = $(addprefix $(OBJDIR)/, $(SOURCE:.c=.o))