Skip to content

Commit d8e1ab0

Browse files
committed
[Windows] Fix 32-bit MinGW LTO build.
1 parent 7b63ac4 commit d8e1ab0

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

core/variant/variant_call.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,7 +1631,7 @@ int Variant::get_enum_value(Variant::Type p_type, const StringName &p_enum_name,
16311631
VARARG_CLASS1(m_type, m_name, m_method, m_arg_type) \
16321632
register_builtin_method<Method_##m_type##_##m_name>(sarray(m_arg_name), Vector<Variant>());
16331633

1634-
static void _register_variant_builtin_methods() {
1634+
static void _register_variant_builtin_methods_string() {
16351635
_VariantCall::constant_data = memnew_arr(_VariantCall::ConstantData, Variant::VARIANT_MAX);
16361636
_VariantCall::enum_data = memnew_arr(_VariantCall::EnumData, Variant::VARIANT_MAX);
16371637
builtin_method_info = memnew_arr(BuiltinMethodMap, Variant::VARIANT_MAX);
@@ -1761,7 +1761,9 @@ static void _register_variant_builtin_methods() {
17611761
/* StringName */
17621762

17631763
bind_method(StringName, hash, sarray(), varray());
1764+
}
17641765

1766+
static void _register_variant_builtin_methods_math() {
17651767
/* Vector2 */
17661768

17671769
bind_method(Vector2, angle, sarray(), varray());
@@ -2059,7 +2061,9 @@ static void _register_variant_builtin_methods() {
20592061
bind_static_method(Color, from_ok_hsl, sarray("h", "s", "l", "alpha"), varray(1.0));
20602062

20612063
bind_static_method(Color, from_rgbe9995, sarray("rgbe"), varray());
2064+
}
20622065

2066+
static void _register_variant_builtin_methods_misc() {
20632067
/* RID */
20642068

20652069
bind_method(RID, is_valid, sarray(), varray());
@@ -2261,7 +2265,9 @@ static void _register_variant_builtin_methods() {
22612265
bind_method(Dictionary, get_or_add, sarray("key", "default"), varray(Variant()));
22622266
bind_method(Dictionary, make_read_only, sarray(), varray());
22632267
bind_method(Dictionary, is_read_only, sarray(), varray());
2268+
}
22642269

2270+
static void _register_variant_builtin_methods_array() {
22652271
/* Array */
22662272

22672273
bind_method(Array, size, sarray(), varray());
@@ -2591,7 +2597,9 @@ static void _register_variant_builtin_methods() {
25912597
bind_method(PackedVector4Array, find, sarray("value", "from"), varray(0));
25922598
bind_method(PackedVector4Array, rfind, sarray("value", "from"), varray(-1));
25932599
bind_method(PackedVector4Array, count, sarray("value"), varray());
2600+
}
25942601

2602+
static void _register_variant_builtin_constants() {
25952603
/* Register constants */
25962604

25972605
int ncc = Color::get_named_color_count();
@@ -2749,7 +2757,11 @@ static void _register_variant_builtin_methods() {
27492757
}
27502758

27512759
void Variant::_register_variant_methods() {
2752-
_register_variant_builtin_methods(); //needs to be out due to namespace
2760+
_register_variant_builtin_methods_string();
2761+
_register_variant_builtin_methods_math();
2762+
_register_variant_builtin_methods_misc();
2763+
_register_variant_builtin_methods_array();
2764+
_register_variant_builtin_constants();
27532765
}
27542766

27552767
void Variant::_unregister_variant_methods() {

0 commit comments

Comments
 (0)