Lines 1-6
Link Here
|
1 |
--- SConstruct.orig Fri Apr 23 07:51:57 2004 |
1 |
--- SConstruct.orig Tue Aug 7 08:35:47 2007 |
2 |
+++ SConstruct Fri Apr 27 12:47:07 2007 |
2 |
+++ SConstruct Tue Aug 7 21:46:43 2007 |
3 |
@@ -53,8 +53,10 @@ |
3 |
@@ -55,8 +55,10 @@ |
4 |
env.make_so = None |
4 |
env.make_so = None |
5 |
env.detect = detect.Detect() |
5 |
env.detect = detect.Detect() |
6 |
|
6 |
|
Lines 12-23
Link Here
|
12 |
env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] |
12 |
env['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] |
13 |
env['ENV']['HOME'] = os.environ['HOME'] |
13 |
env['ENV']['HOME'] = os.environ['HOME'] |
14 |
|
14 |
|
15 |
@@ -87,7 +89,7 @@ |
15 |
@@ -87,14 +89,14 @@ |
16 |
env.optimize_resampler_hack=0 |
16 |
env.Append(CXXFLAGS=['-DNEED_GMP']); |
|
|
17 |
env.Append(LIBS=['-lgmp']); |
18 |
if (env.detect.have_libaudiofile): |
19 |
- env.Append(LIBS=['-laudiofile']); |
20 |
+ env.Append(LIBS=['audiofile']); |
21 |
env.Append(CXXFLAGS=['-DHAVE_LIBAUDIOFILE']); |
22 |
if (env.detect.need_limit_macros_define) : |
23 |
env.Append(CXXFLAGS=['-D__STDC_LIMIT_MACROS']); |
24 |
if (env.detect.have_gnu_basename) : |
25 |
env.Append(CXXFLAGS=['-DHAVE_GNU_BASENAME']); |
26 |
-if (env.detect.have_xpg_basename) : |
27 |
- env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']); |
28 |
+#if (env.detect.have_xpg_basename) : |
29 |
+# env.Append(CXXFLAGS=['-DHAVE_XPG_BASENAME']); |
30 |
if (env.detect.have_stdint_h) : |
31 |
env.Append(CXXFLAGS=['-DHAVE_STDINT_H']); |
32 |
if (env.detect.have_msint) : |
33 |
@@ -103,7 +105,7 @@ |
34 |
env.Append(CXXFLAGS=['-DHAVE_MMAP']); |
35 |
if (env.detect.have_madvise) : |
36 |
env.Append(CXXFLAGS=['-DHAVE_MADVISE']); |
37 |
-env.Append(CXXFLAGS=['-g','-Wall']); |
38 |
+env.Append(CXXFLAGS="%%CXXFLAGS%% %%PTHREAD_CFLAGS%%"); |
39 |
|
40 |
if os.environ.has_key('USE_STACK_CHECK'): |
41 |
env.Append(CXXFLAGS=['-fstack-check']); |
42 |
@@ -159,7 +161,8 @@ |
43 |
|
44 |
|
45 |
|
46 |
-env.Append(LIBS=['z','m','pthread']); |
47 |
+env.Append(LIBS=['z','m']); |
48 |
+env.Append(LINKFLAGS=["%%PTHREAD_LIBS%%"]); |
49 |
|
17 |
|
50 |
|
18 |
if (env['optimize']): |
|
|
19 |
- env.Append(CXXFLAGS=['-O3','-ffast-math']); |
20 |
+ env.Append(CXXFLAGS="%%CFLAGS%%"); |
21 |
env.optimize_resampler_hack=0 |
22 |
|
51 |
|
23 |
profile=0; |
|
|