diff options
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/SCsub | 4 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml | 2 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/GDNative.xml | 16 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/GDNativeLibrary.xml | 50 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/NativeScript.xml | 30 | ||||
| -rw-r--r-- | modules/gdnative/doc_classes/PluginScript.xml | 2 |
6 files changed, 7 insertions, 97 deletions
diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 54d0672a5b..f5a593cf4e 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -245,7 +245,7 @@ if ARGUMENTS.get('gdnative_wrapper', False): gd_wrapper_env = env.Clone() gd_wrapper_env.Append(CPPPATH=['#modules/gdnative/include/']) - # I think this doesn't work on MSVC yet... - gd_wrapper_env.Append(CCFLAGS=['-fPIC']) + if not env.msvc: + gd_wrapper_env.Append(CCFLAGS=['-fPIC']) gd_wrapper_env.Library("#bin/gdnative_wrapper_code", [gensource]) diff --git a/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml b/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml index 10957a3394..e4ffa76d36 100644 --- a/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml +++ b/modules/gdnative/doc_classes/ARVRInterfaceGDNative.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="ARVRInterfaceGDNative" inherits="ARVRInterface" category="Core" version="3.0-alpha"> +<class name="ARVRInterfaceGDNative" inherits="ARVRInterface" category="Core" version="3.0-beta"> <brief_description> GDNative wrapper for an ARVR interface </brief_description> diff --git a/modules/gdnative/doc_classes/GDNative.xml b/modules/gdnative/doc_classes/GDNative.xml index 7a36d09aec..83953cef49 100644 --- a/modules/gdnative/doc_classes/GDNative.xml +++ b/modules/gdnative/doc_classes/GDNative.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="GDNative" inherits="Reference" category="Core" version="3.0-alpha"> +<class name="GDNative" inherits="Reference" category="Core" version="3.0-beta"> <brief_description> </brief_description> <description> @@ -21,26 +21,12 @@ <description> </description> </method> - <method name="get_library"> - <return type="GDNativeLibrary"> - </return> - <description> - </description> - </method> <method name="initialize"> <return type="bool"> </return> <description> </description> </method> - <method name="set_library"> - <return type="void"> - </return> - <argument index="0" name="library" type="GDNativeLibrary"> - </argument> - <description> - </description> - </method> <method name="terminate"> <return type="bool"> </return> diff --git a/modules/gdnative/doc_classes/GDNativeLibrary.xml b/modules/gdnative/doc_classes/GDNativeLibrary.xml index e271665fd4..647d27929f 100644 --- a/modules/gdnative/doc_classes/GDNativeLibrary.xml +++ b/modules/gdnative/doc_classes/GDNativeLibrary.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="GDNativeLibrary" inherits="Resource" category="Core" version="3.0-alpha"> +<class name="GDNativeLibrary" inherits="Resource" category="Core" version="3.0-beta"> <brief_description> </brief_description> <description> @@ -27,54 +27,6 @@ <description> </description> </method> - <method name="get_symbol_prefix" qualifiers="const"> - <return type="String"> - </return> - <description> - </description> - </method> - <method name="is_current_library_statically_linked" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> - <method name="is_singleton" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> - <method name="set_load_once"> - <return type="void"> - </return> - <argument index="0" name="load_once" type="bool"> - </argument> - <description> - </description> - </method> - <method name="set_singleton"> - <return type="void"> - </return> - <argument index="0" name="singleton" type="bool"> - </argument> - <description> - </description> - </method> - <method name="set_symbol_prefix"> - <return type="void"> - </return> - <argument index="0" name="symbol_prefix" type="String"> - </argument> - <description> - </description> - </method> - <method name="should_load_once" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> </methods> <members> <member name="load_once" type="bool" setter="set_load_once" getter="should_load_once"> diff --git a/modules/gdnative/doc_classes/NativeScript.xml b/modules/gdnative/doc_classes/NativeScript.xml index eb4e13f748..3f6025d02f 100644 --- a/modules/gdnative/doc_classes/NativeScript.xml +++ b/modules/gdnative/doc_classes/NativeScript.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="NativeScript" inherits="Script" category="Core" version="3.0-alpha"> +<class name="NativeScript" inherits="Script" category="Core" version="3.0-beta"> <brief_description> </brief_description> <description> @@ -9,40 +9,12 @@ <demos> </demos> <methods> - <method name="get_class_name" qualifiers="const"> - <return type="String"> - </return> - <description> - </description> - </method> - <method name="get_library" qualifiers="const"> - <return type="GDNativeLibrary"> - </return> - <description> - </description> - </method> <method name="new" qualifiers="vararg"> <return type="Object"> </return> <description> </description> </method> - <method name="set_class_name"> - <return type="void"> - </return> - <argument index="0" name="class_name" type="String"> - </argument> - <description> - </description> - </method> - <method name="set_library"> - <return type="void"> - </return> - <argument index="0" name="library" type="GDNativeLibrary"> - </argument> - <description> - </description> - </method> </methods> <members> <member name="class_name" type="String" setter="set_class_name" getter="get_class_name"> diff --git a/modules/gdnative/doc_classes/PluginScript.xml b/modules/gdnative/doc_classes/PluginScript.xml index a5ab422d3c..1a2141247a 100644 --- a/modules/gdnative/doc_classes/PluginScript.xml +++ b/modules/gdnative/doc_classes/PluginScript.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="PluginScript" inherits="Script" category="Core" version="3.0-alpha"> +<class name="PluginScript" inherits="Script" category="Core" version="3.0-beta"> <brief_description> </brief_description> <description> |