From 87f37bc5a305e6a68ef232be580350588e300fcc Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Mon, 28 Apr 2014 21:56:43 -0300 Subject: -Added OpenSSL and HTTPS support -Built-in version of the library for Windows, Android and iOS (other OSs use system one) -Small fixes all around --- platform/x11/detect.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 80d92fb17c..8f848aeb97 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -29,10 +29,16 @@ def can_build(): print("X11 not found.. x11 disabled.") return False + ssl_error=os.system("pkg-config openssl --modversion > /dev/null ") + if (ssl_error): + print("OpenSSL not found.. x11 disabled.") + return False + x11_error=os.system("pkg-config xcursor --modversion > /dev/null ") if (x11_error): print("xcursor not found.. x11 disabled.") return False + return True # X11 enabled @@ -50,7 +56,8 @@ def get_flags(): ('opengl', 'no'), ('legacygl', 'yes'), ('builtin_zlib', 'no'), - ] + ('openssl', 'yes'), + ] @@ -114,6 +121,7 @@ def configure(env): env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') + env.ParseConfig('pkg-config openssl --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs') -- cgit v1.2.3 From 4dc4e96c8a4fb7e34ecae3a39ef0f3f3fb275e97 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 1 May 2014 09:53:37 -0300 Subject: -OpenSSL Fixes --- platform/x11/detect.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 8f848aeb97..82aab95e2a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -121,7 +121,8 @@ def configure(env): env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') - env.ParseConfig('pkg-config openssl --cflags --libs') + if (env["openssl"]=='yes'): + env.ParseConfig('pkg-config openssl --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs') -- cgit v1.2.3 From 6572d5128856b2ec55a2c417c92e584899f4906f Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 1 May 2014 11:34:10 -0300 Subject: -Fixes to OpenSSL compilation (more) -Fix bug in GDScript, now static functions can call static functions. --- platform/x11/detect.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'platform/x11/detect.py') diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 82aab95e2a..cff7ea86b6 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -56,7 +56,7 @@ def get_flags(): ('opengl', 'no'), ('legacygl', 'yes'), ('builtin_zlib', 'no'), - ('openssl', 'yes'), + ("openssl", "yes"), ] @@ -121,8 +121,7 @@ def configure(env): env.ParseConfig('pkg-config x11 --cflags --libs') env.ParseConfig('pkg-config xcursor --cflags --libs') - if (env["openssl"]=='yes'): - env.ParseConfig('pkg-config openssl --cflags --libs') + env.ParseConfig('pkg-config openssl --cflags --libs') env.ParseConfig('pkg-config freetype2 --cflags --libs') -- cgit v1.2.3