From e38d473fdd5367e0488c0cabcc71b8d686927e43 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Sat, 24 Jul 2010 14:00:00 +0000 Subject: [PATCH] Compile Fixes on Mac --- SConstruct | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index a8fc964d3..afe2b4a2f 100644 --- a/SConstruct +++ b/SConstruct @@ -51,6 +51,12 @@ if not conf.CheckLib('boost_thread'): if not conf.CheckLib('boost_thread-mt'): print "boost thread library not found. Exiting" Exit(-1) + else: + env.Append(CCFLAGS = ' -lboost_thread-mt') + env.Append(LINKFLAGS = ' -lboost_thread-mt') +else: + env.Append(CCFLAGS = ' -lboost_thread-mt') + env.Append(LINKFLAGS = ' -lboost_thread-mt') if not conf.CheckCXXHeader('boost/thread.hpp'): print "boost thread header not found. Exiting" Exit(-1) @@ -66,9 +72,6 @@ if not conf.CheckCXXHeader('boost/noncopyable.hpp'): if not conf.CheckCXXHeader('boost/shared_ptr.hpp'): print "boost/shared_ptr.hpp not found. Exiting" Exit(-1) -if not conf.CheckCXXHeader('kdtree++/kdtree.hpp'): - print "kdtree++/kdtree.hpp not found. Exiting" - Exit(-1) if not conf.CheckLib('stxxl'): print "stxxl library not found. Exiting" Exit(-1) @@ -78,8 +81,8 @@ env.Append(LINKFLAGS = ' -fopenmp') env.Program("extractNetwork.cpp") env.Program("extractLargeNetwork.cpp") env.Program("createHierarchy.cpp") -env.Append(CCFLAGS = ' -lboost_regex -lboost_iostreams -lboost_thread -lboost_system') -env.Append(LINKFLAGS = ' -lboost_regex -lboost_iostreams -lboost_thread -lboost_system') +env.Append(CCFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system') +env.Append(LINKFLAGS = ' -lboost_regex -lboost_iostreams -lboost_system') env.Program("routed.cpp") env = conf.Finish()