From 6572d5128856b2ec55a2c417c92e584899f4906f Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Thu, 1 May 2014 11:34:10 -0300 Subject: [PATCH] -Fixes to OpenSSL compilation (more) -Fix bug in GDScript, now static functions can call static functions. --- SConstruct | 3 ++- bin/tests/test_gdscript.cpp | 3 +++ demos/2d/platformer/engine.cfg | 6 ++++-- drivers/openssl/register_openssl.cpp | 3 +++ drivers/openssl/stream_peer_openssl.cpp | 19 +++++++++++++++++++ modules/gdscript/gd_compiler.cpp | 7 ++++++- modules/gdscript/gd_script.cpp | 5 +++++ modules/gdscript/gd_script.h | 20 +++++++++++--------- platform/x11/detect.py | 5 ++--- 9 files changed, 55 insertions(+), 16 deletions(-) diff --git a/SConstruct b/SConstruct index d3e492a18c5..a5489d15340 100644 --- a/SConstruct +++ b/SConstruct @@ -204,7 +204,8 @@ for p in platform_list: flag_list = platform_flags[p] for f in flag_list: - env[f[0]] = f[1] + env[f[0]] = f[1] + print(f[0]+":"+f[1]) env.module_list=[] diff --git a/bin/tests/test_gdscript.cpp b/bin/tests/test_gdscript.cpp index 9670e6af6e4..b62deee2cd7 100644 --- a/bin/tests/test_gdscript.cpp +++ b/bin/tests/test_gdscript.cpp @@ -442,6 +442,9 @@ static String _disassemble_addr(const Ref& p_script,const GDFunction& case GDFunction::ADDR_TYPE_SELF: { return "self"; } break; + case GDFunction::ADDR_TYPE_CLASS: { + return "class"; + } break; case GDFunction::ADDR_TYPE_MEMBER: { return "member("+p_script->debug_get_member_by_index(addr)+")"; diff --git a/demos/2d/platformer/engine.cfg b/demos/2d/platformer/engine.cfg index d6fa25c9180..50b6b862e97 100644 --- a/demos/2d/platformer/engine.cfg +++ b/demos/2d/platformer/engine.cfg @@ -15,8 +15,6 @@ stretch_aspect="keep" [image_loader] -;filter=false -;gen_mipmaps=false repeat=false [input] @@ -31,6 +29,10 @@ spawn=[key(F1), jbutton(0, 11)] default_gravity=700 +[rasterizer] + +use_pixel_snap=true + [render] mipmap_policy=1 diff --git a/drivers/openssl/register_openssl.cpp b/drivers/openssl/register_openssl.cpp index fe12c556569..a4a60813b6b 100644 --- a/drivers/openssl/register_openssl.cpp +++ b/drivers/openssl/register_openssl.cpp @@ -1,6 +1,7 @@ #include "register_openssl.h" #include "stream_peer_openssl.h" +#ifdef OPENSSL_ENABLED void register_openssl() { @@ -14,3 +15,5 @@ void unregister_openssl() { StreamPeerOpenSSL::finalize_ssl(); } +#endif + diff --git a/drivers/openssl/stream_peer_openssl.cpp b/drivers/openssl/stream_peer_openssl.cpp index 0751c76e3d1..0151ced3b80 100644 --- a/drivers/openssl/stream_peer_openssl.cpp +++ b/drivers/openssl/stream_peer_openssl.cpp @@ -553,6 +553,25 @@ void StreamPeerOpenSSL::initialize_ssl() { } String config_path =GLOBAL_DEF("ssl/config",""); Globals::get_singleton()->set_custom_property_info("ssl/config",PropertyInfo(Variant::STRING,"ssl/config",PROPERTY_HINT_FILE,"*.cnf")); + if (config_path!="") { + + Vector data = FileAccess::get_file_as_array(config_path); + if (data.size()) { + data.push_back(0); + BIO* mem = BIO_new(BIO_s_mem()); + BIO_puts(mem,(const char*) data.ptr()); + + while(true) { + X509*cert = PEM_read_bio_X509(mem, NULL, 0, NULL); + if (!cert) + break; + certs.push_back(cert); + } + BIO_free(mem); + } + print_line("Loaded certs from '"+certs_path+"': "+itos(certs.size())); + + } } diff --git a/modules/gdscript/gd_compiler.cpp b/modules/gdscript/gd_compiler.cpp index dd2834bf34c..90c83c201bd 100644 --- a/modules/gdscript/gd_compiler.cpp +++ b/modules/gdscript/gd_compiler.cpp @@ -452,6 +452,7 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre const GDParser::Node *instance = on->arguments[0]; + bool in_static=false; if (instance->type==GDParser::Node::TYPE_SELF) { //room for optimization @@ -465,7 +466,10 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre int ret; - if (i==1) { + if (i==0 && on->arguments[i]->type==GDParser::Node::TYPE_SELF && codegen.function_node && codegen.function_node->_static) { + //static call to self + ret=(GDFunction::ADDR_TYPE_CLASS<arguments[i]->type!=GDParser::Node::TYPE_IDENTIFIER) { _set_error("Attempt to call a non-identifier.",on); @@ -475,6 +479,7 @@ int GDCompiler::_parse_expression(CodeGen& codegen,const GDParser::Node *p_expre ret=codegen.get_name_map_pos(id->name); } else { + ret = _parse_expression(codegen,on->arguments[i],slevel); if (ret<0) return ret; diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 75bb47ceab8..299a7d3e54c 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -61,6 +61,10 @@ Variant *GDFunction::_get_variant(int p_address,GDInstance *p_instance,GDScript } return &self; } break; + case ADDR_TYPE_CLASS: { + + return &p_script->_static_ref; + } break; case ADDR_TYPE_MEMBER: { //member indexing is O(1) if (!p_instance) { @@ -1678,6 +1682,7 @@ Ref GDScript::get_base() const { GDScript::GDScript() { + _static_ref=this; valid=false; subclass_count=0; initializer=NULL; diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h index 55bc547e8da..983899240ae 100644 --- a/modules/gdscript/gd_script.h +++ b/modules/gdscript/gd_script.h @@ -75,13 +75,14 @@ public: ADDR_MASK=((1< > *r_stackvars) const; + void debug_get_stack_member_state(int p_line,List > *r_stackvars) const; _FORCE_INLINE_ bool is_empty() const { return _code_size==0; } @@ -183,6 +184,7 @@ friend class GDInstance; friend class GDFunction; friend class GDCompiler; friend class GDFunctions; + Variant _static_ref; //used for static call Ref native; Ref base; GDScript *_base; //fast pointer access diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 82aab95e2ae..cff7ea86b60 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')