From: John Hodge <tpg@mutabah.net>
Date: Tue, 11 May 2010 02:18:09 +0000 (+0800)
Subject: Merge branch 'master' of serenade.mutabah.net:acess2
X-Git-Tag: rel0.06~197
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=3234a52a913609230ffc140c27542d421bb1b7d3;hp=-c;p=tpg%2Facess2.git

Merge branch 'master' of serenade.mutabah.net:acess2
---

3234a52a913609230ffc140c27542d421bb1b7d3
diff --combined Makefile.cfg
index 3451f90e,991a98da..ad972f70
--- a/Makefile.cfg
+++ b/Makefile.cfg
@@@ -2,10 -2,10 +2,10 @@@
  # Acess2 Build Configuration
  #
  
 -CC = gcc
 -LD = ld
 +CC = i586-elf-gcc
 +LD = i586-elf-ld
  AS = nasm
 -OBJDUMP = objdump
 +OBJDUMP = i586-elf-objdump
  RM = @rm -f
  STRIP = strip
  MKDIR = mkdir
@@@ -19,6 -19,7 +19,7 @@@ xRM = mde
  ifeq ($(ARCH),)
  	ARCH = i386
  endif
+ -include Makefile.$(ARCH).cfg
  ifeq ($(ARCHDIR),)
  	ARCHDIR = x86
  endif