summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohn Tytgat <joty@netsurf-browser.org>2008-09-28 20:35:57 +0000
committerJohn Tytgat <joty@netsurf-browser.org>2008-09-28 20:35:57 +0000
commit5e5efb6ab4d51bfef5032844962d3b21db0e6c69 (patch)
tree05f63c97b49724abf7c7017832408ad568887162 /Makefile
parent7d457f94d6c0e1150624a7ece89607a5f5e1b2f3 (diff)
downloadlibnsgif-5e5efb6ab4d51bfef5032844962d3b21db0e6c69.tar.gz
libnsgif-5e5efb6ab4d51bfef5032844962d3b21db0e6c69.tar.bz2
GCCSDK 4 build compatibility (not finished yet)
svn path=/trunk/libnsgif/; revision=5458
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile40
1 files changed, 20 insertions, 20 deletions
diff --git a/Makefile b/Makefile
index ecaa0eb..8d81a19 100644
--- a/Makefile
+++ b/Makefile
@@ -18,29 +18,29 @@ SED = sed
DOXYGEN = doxygen
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
-LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
-EXEEXT ?= ,ff8
-PREFIX = $(GCCSDK_INSTALL_ENV)
+ 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
+ LIBS = -L$(GCCSDK_INSTALL_ENV)/lib
+ ifneq (,$(findstring arm-unknown-riscos-gcc,$(CC)))
+ EXEEXT := ,e1f
+ SUBTARGET := -elf-
+ else
+ EXEEXT := ,ff8
+ SUBTARGET := -aof-
+ endif
+ PREFIX = $(GCCSDK_INSTALL_ENV)
else
-CFLAGS += -g
-LIBS =
-PREFIX = /usr/local
+ CFLAGS += -g
+ 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))