From ca339fcc4d45001722c9eaf45843e53532f25012 Mon Sep 17 00:00:00 2001
From: John Tytgat <joty@netsurf-browser.org>
Date: Thu, 5 Jan 2006 22:01:38 +0000
Subject: [project @ 2006-01-05 22:01:38 by joty] Using
 GCCSDK_INSTALL_ENV/GCCSDK_INSTALL_CROSSBIN, support for GCCSDK Autobuilder
 and liboslib -> libOSLib32

svn path=/import/netsurf/; revision=1986
---
 makefile | 10 +++++-----
 posix.mk | 25 ++++++++++++++-----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/makefile b/makefile
index 183d4a33f..c5ab392a9 100644
--- a/makefile
+++ b/makefile
@@ -15,7 +15,7 @@
 #   gtk -- experimental gtk version
 #
 # "riscos", "riscos_small", "ncos", and "riscos_debug" can be compiled under
-# RISC OS, or cross-compiled using gccsdk.
+# RISC OS, or cross-compiled using GCCSDK.
 
 OBJECTS_COMMON = content.o fetch.o fetchcache.o	url_store.o	# content/
 OBJECTS_COMMON += css.o css_enum.o parser.o ruleset.o scanner.o	# css/
@@ -78,14 +78,14 @@ OBJS_DEBUG=$(OBJECTS_DEBUG:%.o=$(OBJDIR_DEBUG)/%.o)
 
 OBJS_DEBUGRO=$(OBJECTS_DEBUGRO:%.o=$(OBJDIR_RISCOS)/%.o)
 
-OBJDIR_GTK = $(shell gcc -dumpmachine)-gtk
+OBJDIR_GTK = $(shell /usr/bin/gcc -dumpmachine)-gtk
 SOURCES_GTK=$(OBJECTS_GTK:.o=.c)
 OBJS_GTK=$(OBJECTS_GTK:%.o=$(OBJDIR_GTK)/%.o)
 
 # Inclusion of platform specific files has to occur after the OBJDIR stuff as
 # that is refered to in the files
 
-OS = $(word 2,$(subst -, ,$(shell gcc -dumpmachine)))
+OS = $(word 2,$(subst -, ,$(shell /usr/bin/gcc -dumpmachine)))
 ifeq ($(OS),riscos)
 include riscos.mk
 else
@@ -137,7 +137,7 @@ nsrodebug,ff8: $(OBJS_DEBUGRO)
 
 gtk: nsgtk
 nsgtk: $(OBJS_GTK)
-	gcc -o nsgtk `pkg-config --cflags --libs gtk+-2.0 gthread-2.0` \
+	/usr/bin/gcc -o nsgtk `pkg-config --cflags --libs gtk+-2.0 gthread-2.0` \
 	$(LDFLAGS_DEBUG) $^
 
 netsurf.zip: $(RUNIMAGE)
@@ -155,7 +155,7 @@ $(OBJDIR_DEBUG)/%.o : %.c
 	@$(CC_DEBUG) -o $@ -c $(CFLAGS_DEBUG) $<
 $(OBJDIR_GTK)/%.o : %.c
 	@echo "==> $<"
-	@gcc -o $@ -c $(CFLAGS_GTK) $<
+	@/usr/bin/gcc -o $@ -c $(CFLAGS_GTK) $<
 
 # pattern rules for asm source
 $(OBJDIR_RISCOS)/%.o : %.s
diff --git a/posix.mk b/posix.mk
index 6f75a43c3..a6ea7e815 100644
--- a/posix.mk
+++ b/posix.mk
@@ -1,18 +1,21 @@
-CC = /home/riscos/cross/bin/gcc
-CC_DEBUG = gcc
-ASM = /home/riscos/cross/bin/gcc
+GCCSDK_INSTALL_CROSSBIN ?= /home/riscos/cross/bin
+GCCSDK_INSTALL_ENV ?= /home/riscos/env
 
-PLATFORM_CFLAGS_RISCOS = -I/home/riscos/env/include \
-		-I/home/riscos/env/include/libxml2 \
-		-I/home/riscos/env/include/libmng
+CC = $(GCCSDK_INSTALL_CROSSBIN)/gcc
+CC_DEBUG = /usr/bin/gcc
+ASM = $(GCCSDK_INSTALL_CROSSBIN)/gcc
+
+PLATFORM_CFLAGS_RISCOS = -I$(GCCSDK_INSTALL_ENV)/include \
+		-I$(GCCSDK_INSTALL_ENV)/include/libxml2 \
+		-I$(GCCSDK_INSTALL_ENV)/include/libmng
 PLATFORM_CFLAGS_DEBUG = -I/usr/include/libxml2 -I/riscos/src/OSLib \
 		-I/riscos/include/libjpeg -D_POSIX_C_SOURCE
-PLATFORM_AFLAGS_RISCOS = -I/riscos/src/OSLib
+PLATFORM_AFLAGS_RISCOS = -I$(GCCSDK_INSTALL_ENV)/include
 
-LDFLAGS_RISCOS = -L/home/riscos/env/lib -lxml2 -lz -lcurl -lssl -lcrypto \
-		-lcares -lmng -loslib -ljpeg -lrufl -lpencil
-LDFLAGS_SMALL = -L/home/riscos/env/lib -lxml2 -lz -lucurl -lcares -lmng \
-		-loslib -ljpeg -lrufl -lpencil
+LDFLAGS_RISCOS = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz -lcurl -lssl -lcrypto \
+		-lcares -lmng -lOSLib32 -ljpeg -lrufl -lpencil
+LDFLAGS_SMALL = -L$(GCCSDK_INSTALL_ENV)/lib -lxml2 -lz -lucurl \
+		-lcares -lmng -lOSLib32 -ljpeg -lrufl -lpencil
 LDFLAGS_DEBUG = -L/usr/lib -lxml2 -lz -lm -lcurl -lssl -lcrypto -ldl -lmng \
 		-ljpeg -llcms
 
-- 
cgit v1.2.3