diff options
author | Juan Linietsky <reduzio@gmail.com> | 2015-09-03 23:24:55 -0300 |
---|---|---|
committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-03 23:24:55 -0300 |
commit | b0aa49accbd7e45dae38f1bd43b0fbdd11714211 (patch) | |
tree | f9173780301097b0da9bba0203402c33036ea72d /platform/android/detect.py | |
parent | 7900d5daf21434a9396894a7c3ac360c03938770 (diff) |
merged some stuff for okam
Diffstat (limited to 'platform/android/detect.py')
-rw-r--r-- | platform/android/detect.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/platform/android/detect.py b/platform/android/detect.py index 76575a1ec6..fce1fe3ed6 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -173,8 +173,7 @@ def configure(env): env.Append(LDPATH=[ld_path]) env.Append(LIBS=['OpenSLES']) # env.Append(LIBS=['c','m','stdc++','log','EGL','GLESv1_CM','GLESv2','OpenSLES','supc++','android']) - if (env["ndk_platform"]!="2.2"): - env.Append(LIBS=['EGL','OpenSLES','android']) + env.Append(LIBS=['EGL','OpenSLES','android']) env.Append(LIBS=['c','m','stdc++','log','GLESv1_CM','GLESv2', 'z']) env["LINKFLAGS"]= string.split(" -g --sysroot="+ld_sysroot+" -Wl,--no-undefined -Wl,-z,noexecstack ") |