From: John Hodge Date: Wed, 23 Mar 2011 05:45:58 +0000 (+0800) Subject: Fiddling with build system X-Git-Tag: rel0.10~146 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=d56f21167a202dc01226c1c2ac0fd264c6eb8b5d;p=tpg%2Facess2.git Fiddling with build system --- diff --git a/Makefile.cfg b/Makefile.cfg index 8c5b59b9..ff49c162 100644 --- a/Makefile.cfg +++ b/Makefile.cfg @@ -11,8 +11,8 @@ ACESSDIR := $(dir $(lastword $(MAKEFILE_LIST))) ACESSDIR := $(shell cd $(ACESSDIR) && pwd) # Default build programs -CC := gcc -LD := ld +#CC := gcc +#LD := ld AS := nasm DISASM := objdump -d -S RM := @rm -f @@ -29,7 +29,9 @@ endif ifeq ($(ARCHDIR),) ARCHDIR := x86 endif +ifneq ($(ARCH),host) -include $(ACESSDIR)/Makefile.$(ARCHDIR).cfg +endif # Makefile.user.cfg is not part of the Acess git repo, # It is for overriding the options in this file diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg index 2e64b9d6..3aa1a795 100644 --- a/Usermode/Applications/Makefile.cfg +++ b/Usermode/Applications/Makefile.cfg @@ -1,18 +1,12 @@ # Acess 2 Applications # General Makefile -#-include ../../../Makefile.cfg -# satisfying 2 deep applications -#ifeq ($(ACESSDIR),) -# -include ../../../../Makefile.cfg -#endif - # Include Usermode Makefile.cfg include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg - ASFLAGS = -felf CPPFLAGS = -I$(ACESSUSERDIR)/include/ CFLAGS = -fno-stack-protector $(CPPFLAGS) LDFLAGS = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc + DIR = Bin