| 1 | --- BuildSupport.py.orig 2012-02-04 11:37:22.000000000 -0600 |
|---|
| 2 | +++ BuildSupport.py 2012-11-04 05:02:45.000000000 -0600 |
|---|
| 3 | @@ -70,19 +70,15 @@ |
|---|
| 4 | # ------------------------------------------------------------------------------ |
|---|
| 5 | |
|---|
| 6 | systemIncludePaths = { |
|---|
| 7 | - "darwin" : { arch32 : ["/usr/local/include", |
|---|
| 8 | - "/opt/local/include"], |
|---|
| 9 | - arch64 : ["/usr/local/include", |
|---|
| 10 | - "/opt/local/include"]}, |
|---|
| 11 | + "darwin" : { arch32 : ["@PREFIX@/include"], |
|---|
| 12 | + arch64 : ["@PREFIX@/include"]}, |
|---|
| 13 | "linux2" : { arch32 : ["/usr/local/include"], |
|---|
| 14 | arch64 : ["/usr/local64/include"]} |
|---|
| 15 | } |
|---|
| 16 | |
|---|
| 17 | systemLibPaths = { |
|---|
| 18 | - "darwin" : { arch32 : ["/usr/local/lib", |
|---|
| 19 | - "/opt/local/lib"], |
|---|
| 20 | - arch64 : ["/usr/local/lib", |
|---|
| 21 | - "/opt/local/lib"]}, |
|---|
| 22 | + "darwin" : { arch32 : ["@PREFIX@/lib"], |
|---|
| 23 | + arch64 : ["@PREFIX@/lib"]}, |
|---|
| 24 | "linux2" : { arch32 : ["/usr/local/lib"], |
|---|
| 25 | arch64 : ["/usr/local64/lib"]} |
|---|
| 26 | } |
|---|
| 27 | @@ -214,6 +210,8 @@ |
|---|
| 28 | env.Append(LIBS = [Site.boostThreadLib]) |
|---|
| 29 | else: |
|---|
| 30 | env.Append(LIBS = ["boost_thread-mt"]) |
|---|
| 31 | + # Boost system |
|---|
| 32 | + env.Append(LIBS = ["boost_system-mt"]) |
|---|
| 33 | # Compile flags |
|---|
| 34 | if isDebugBuild(): |
|---|
| 35 | env.Append(CCFLAGS = ["-g"]) |
|---|
| 36 | @@ -222,13 +220,6 @@ |
|---|
| 37 | env.Append(CCFLAGS = ["-Wall"]) |
|---|
| 38 | # Set number of jobs to use |
|---|
| 39 | env.SetOption('num_jobs', numCPUs()) |
|---|
| 40 | - # 64 bit setup |
|---|
| 41 | - if architectureStr() == arch64: |
|---|
| 42 | - env.Append(CCFLAGS = ["-m64"]) |
|---|
| 43 | - env.Append(LINKFLAGS = ["-m64"]) |
|---|
| 44 | - else: |
|---|
| 45 | - env.Append(CCFLAGS = ["-m32"]) |
|---|
| 46 | - env.Append(LINKFLAGS = ["-m32"]) |
|---|
| 47 | # Prettify SCons output |
|---|
| 48 | if ARGUMENTS.get("verbose", 0) != "1": |
|---|
| 49 | env["ARCOMSTR"] = "AR $TARGET" |
|---|
