git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Broke threads.h into two files (for better isolation)
[tpg/acess2.git]
/
Usermode
/
Applications
/
Makefile.cfg
diff --git
a/Usermode/Applications/Makefile.cfg
b/Usermode/Applications/Makefile.cfg
index
bc33f90
..
3aa1a79
100644
(file)
--- a/
Usermode/Applications/Makefile.cfg
+++ b/
Usermode/Applications/Makefile.cfg
@@
-1,15
+1,12
@@
# Acess 2 Applications
# General Makefile
# Acess 2 Applications
# General Makefile
--include ../../../Makefile.cfg
-# satisfying 2 deep applications
-ifeq ($(ACESSDIR),)
- -include ../../../../Makefile.cfg
-endif
-ACESSUSERDIR := $(ACESSDIR)/Usermode
+# Include Usermode Makefile.cfg
+include $(dir $(lastword $(MAKEFILE_LIST)))../Makefile.cfg
ASFLAGS = -felf
CPPFLAGS = -I$(ACESSUSERDIR)/include/
CFLAGS = -fno-stack-protector $(CPPFLAGS)
ASFLAGS = -felf
CPPFLAGS = -I$(ACESSUSERDIR)/include/
CFLAGS = -fno-stack-protector $(CPPFLAGS)
-LDFLAGS = -T $(ACESSUSERDIR)/Libraries/acess.ld -L $(ACESSUSERDIR)/Libraries -I /Acess/Libs/ld-acess.so -lc
+LDFLAGS = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc
+
DIR = Bin
DIR = Bin
UCC
git Repository :: git.ucc.asn.au