summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorhurikhan <m4r10.5ch14ck@gmail.com>2015-01-14 13:31:16 +0800
committerhurikhan <m4r10.5ch14ck@gmail.com>2015-01-14 13:31:16 +0800
commit8a30feebbe676ab922515b58d0deec2f95aa104c (patch)
tree55a208d7835022f6b876b4e45d5a482fbd4bd83f /platform
parent2203ba5fe3f7cdca078dd557ec532b7f335d3670 (diff)
parent9012cd408e240d6039120e56fdd47a0983890993 (diff)
Merge remote-tracking branch 'upstream/master' into x11-window-management
Conflicts: platform/x11/detect.py
Diffstat (limited to 'platform')
-rw-r--r--platform/android/java_glue.cpp1
-rw-r--r--platform/x11/detect.py14
2 files changed, 9 insertions, 6 deletions
diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp
index 89a9091baa..0312d13644 100644
--- a/platform/android/java_glue.cpp
+++ b/platform/android/java_glue.cpp
@@ -205,6 +205,7 @@ Variant _jobject_to_variant(JNIEnv * env, jobject obj) {
String name = _get_class_name(env, c, &array);
//print_line("name is " + name + ", array "+Variant(array));
+ print_line("ARGNAME: "+name);
if (name == "java.lang.String") {
return String::utf8(env->GetStringUTFChars( (jstring)obj, NULL ));
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 1eb615893b..773928c72d 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -52,6 +52,7 @@ def get_opts():
return [
('use_llvm','Use llvm compiler','no'),
('use_sanitizer','Use llvm compiler sanitize address','no'),
+ ('pulseaudio','Detect & Use pulseaudio','yes'),
('experimental_wm_api', 'Use experimental window management API','no'),
]
@@ -121,12 +122,13 @@ def configure(env):
env.Append(CPPFLAGS=['-DOPENGL_ENABLED','-DGLEW_ENABLED'])
env.Append(CPPFLAGS=["-DALSA_ENABLED"])
- if not os.system("pkg-config --exists libpulse-simple"):
- print("Enabling PulseAudio")
- env.Append(CPPFLAGS=["-DPULSEAUDIO_ENABLED"])
- env.ParseConfig('pkg-config --cflags --libs libpulse-simple')
- else:
- print("PulseAudio development libraries not found, disabling driver")
+ if (env["pulseaudio"]=="yes"):
+ if not os.system("pkg-config --exists libpulse-simple"):
+ print("Enabling PulseAudio")
+ env.Append(CPPFLAGS=["-DPULSEAUDIO_ENABLED"])
+ env.ParseConfig('pkg-config --cflags --libs libpulse-simple')
+ else:
+ print("PulseAudio development libraries not found, disabling driver")
env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
env.Append(LIBS=['GL', 'GLU', 'pthread','asound','z']) #TODO detect linux/BSD!