|
Lines 1-5
Link Here
|
| 1 |
--- platform/x11/detect.py.orig 2014-12-15 21:49:18.000000000 +0300 |
1 |
--- ./platform/x11/detect.py.orig 2015-05-22 03:33:21.000000000 +0930 |
| 2 |
+++ platform/x11/detect.py 2015-03-03 07:01:34.000000000 +0300 |
2 |
+++ ./platform/x11/detect.py 2015-05-23 14:57:49.522273728 +0930 |
| 3 |
@@ -29,11 +29,6 @@ |
3 |
@@ -29,11 +29,6 @@ |
| 4 |
print("X11 not found.. x11 disabled.") |
4 |
print("X11 not found.. x11 disabled.") |
| 5 |
return False |
5 |
return False |
|
Lines 12-63
Link Here
|
| 12 |
x11_error=os.system("pkg-config xcursor --modversion > /dev/null ") |
12 |
x11_error=os.system("pkg-config xcursor --modversion > /dev/null ") |
| 13 |
if (x11_error): |
13 |
if (x11_error): |
| 14 |
print("xcursor not found.. x11 disabled.") |
14 |
print("xcursor not found.. x11 disabled.") |
| 15 |
@@ -72,17 +67,16 @@ |
15 |
@@ -126,7 +121,7 @@ |
| 16 |
|
|
|
| 17 |
env.Append(CPPPATH=['#platform/x11']) |
| 18 |
if (env["use_llvm"]=="yes"): |
| 19 |
- env["CC"]="clang" |
| 20 |
- env["CXX"]="clang++" |
| 21 |
- env["LD"]="clang++" |
| 22 |
- if (env["use_sanitizer"]=="yes"): |
| 23 |
- env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer']) |
| 24 |
- env.Append(LINKFLAGS=['-fsanitize=address']) |
| 25 |
- env.extra_suffix=".llvms" |
| 26 |
- else: |
| 27 |
- env.extra_suffix=".llvm" |
| 28 |
- |
| 29 |
- |
| 30 |
+ if 'clang++' not in env['CXX']: |
| 31 |
+ env["CC"]="clang" |
| 32 |
+ env["CXX"]="clang++" |
| 33 |
+ env["LD"]="clang++" |
| 34 |
+ env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) |
| 35 |
+ env.extra_suffix=".llvm" |
| 36 |
+ |
| 37 |
+ if (env["use_sanitizer"]=="yes"): |
| 38 |
+ env.Append(CCFLAGS=['-fsanitize=address','-fno-omit-frame-pointer']) |
| 39 |
+ env.Append(LINKFLAGS='-fsanitize=address') |
| 40 |
|
| 41 |
|
| 42 |
#if (env["tools"]=="no"): |
| 43 |
@@ -105,7 +99,7 @@ |
| 44 |
|
| 45 |
env.ParseConfig('pkg-config x11 --cflags --libs') |
16 |
env.ParseConfig('pkg-config x11 --cflags --libs') |
|
|
17 |
env.ParseConfig('pkg-config xinerama --cflags --libs') |
| 46 |
env.ParseConfig('pkg-config xcursor --cflags --libs') |
18 |
env.ParseConfig('pkg-config xcursor --cflags --libs') |
| 47 |
- env.ParseConfig('pkg-config openssl --cflags --libs') |
19 |
- env.ParseConfig('pkg-config openssl --cflags --libs') |
| 48 |
+ env.ParseConfig('echo -lssl -lcrypto') |
20 |
+ env.ParseConfig('echo -lssl -lcrypto') |
| 49 |
|
21 |
|
| 50 |
|
22 |
|
| 51 |
env.ParseConfig('pkg-config freetype2 --cflags --libs') |
23 |
env.ParseConfig('pkg-config freetype2 --cflags --libs') |
| 52 |
@@ -128,11 +122,6 @@ |
|
|
| 53 |
env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu']) |
| 54 |
|
| 55 |
|
| 56 |
- if (env["CXX"]=="clang++"): |
| 57 |
- env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) |
| 58 |
- env["CC"]="clang" |
| 59 |
- env["LD"]="clang++" |
| 60 |
- |
| 61 |
import methods |
| 62 |
|
| 63 |
env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) |