commit 24c524df581cbdcdc0591966910c2807df0f69cf
parent 957202ccebec80e7104951b75bdaf677b83907dc
Author: Kyle Milz <kyle@0x30.net>
Date: Sat, 9 Jul 2016 22:40:31 -0600
tweak some Jamfiles
Diffstat:
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/Jamrules b/Jamrules
@@ -1,12 +1,12 @@
if $(PREFIX) {
# PREFIX was set, use absolute install paths.
- CITRUN_LIB = $(PREFIX)/lib/libcitrun.a ;
+ CITRUN_LIB = $(PREFIX)/lib/libcitrun.a ;
CITRUN_PATH = $(PREFIX)/share/citrun ;
}
else {
# No PREFIX means an in tree build. Use absolute paths to local copies.
PWD = `pwd` ;
- CITRUN_LIB = $(PWD)/lib/libcitrun.a ;
+ CITRUN_LIB = $(PWD)/lib/libcitrun.a ;
CITRUN_PATH = $(PWD)/share ;
}
diff --git a/src/Jamfile b/src/Jamfile
@@ -33,11 +33,10 @@ GL_SRCS =
matrix4x4.c
trackball.c ;
-ObjectC++Flags $(INST_SRCS) $(GL_SRCS) : -std=c++11 ;
-
ObjectC++Flags $(INST_SRCS) : `llvm-config --cxxflags` ;
+
+ObjectC++Flags $(GL_SRCS) : -std=c++11 ;
ObjectC++Flags $(GL_SRCS) : `pkg-config $(PKG_CONFIG_LIBS) --cflags` ;
-ObjectC++Flags $(GL_SRCS) : -I/usr/local/include ;
LINKFLAGS on citrun-inst = `llvm-config --ldflags` ;