Skip to content

Commit 29f0d3d

Browse files
committed
Fix build, fix some random warnings.
1 parent 1d52a53 commit 29f0d3d

File tree

8 files changed

+17
-13
lines changed

8 files changed

+17
-13
lines changed

example/2d_tutorial/src/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,14 @@ packages:
199199
path: "../../../src/dart/godot_dart"
200200
relative: true
201201
source: path
202-
version: "0.8.0"
202+
version: "0.9.0"
203203
godot_dart_build:
204204
dependency: "direct dev"
205205
description:
206206
path: "../../../src/dart/godot_dart_build"
207207
relative: true
208208
source: path
209-
version: "0.6.0"
209+
version: "0.7.0"
210210
graphs:
211211
dependency: transitive
212212
description:

example/networking-demo/src/pubspec.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,14 +199,14 @@ packages:
199199
path: "../../../src/dart/godot_dart"
200200
relative: true
201201
source: path
202-
version: "0.8.0"
202+
version: "0.9.0"
203203
godot_dart_build:
204204
dependency: "direct dev"
205205
description:
206206
path: "../../../src/dart/godot_dart_build"
207207
relative: true
208208
source: path
209-
version: "0.6.0"
209+
version: "0.7.0"
210210
graphs:
211211
dependency: transitive
212212
description:

prepare.sh

100755100644
File mode changed.

src/cpp/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ elseif(LINUX)
8888
# Find shared libraries next to the executable
8989
set_target_properties(godot_dart PROPERTIES
9090
BUILD_WITH_INSTALL_RPATH FALSE
91-
LINK_FLAGS "-rpath,./")
91+
LINK_FLAGS "-rpath ./")
9292

9393
target_link_libraries(godot_dart
9494
Threads::Threads

src/cpp/gde_c_interface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ void gde_variant_set_indexed(GDExtensionVariantPtr p_self, GDExtensionInt p_inde
196196
static GDExtensionInterfaceVariantGetPtrUtilityFunction _variant_get_ptr_utility_function_func = nullptr;
197197
GDExtensionPtrUtilityFunction gde_variant_get_ptr_utility_function(GDExtensionConstStringNamePtr p_function,
198198
GDExtensionInt p_hash) {
199-
if (gde_variant_get_ptr_utility_function) {
199+
if (_variant_get_ptr_utility_function_func) {
200200
return _variant_get_ptr_utility_function_func(p_function, p_hash);
201201
}
202202
return nullptr;

src/cpp/ref_counted_wrapper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ int RefCountedWrapper::get_reference_count() {
3737
}
3838

3939
void RefCountedWrapper::init() {
40-
const int class_hash = 2240911060;
40+
const GDExtensionInt class_hash = 2240911060;
4141
godot::StringName class_name("RefCounted");
4242
init_ref_ptr_call =
43-
gde_classdb_get_method_bind(class_name._native_ptr(), godot::StringName("init_ref")._native_ptr(), 2240911060);
43+
gde_classdb_get_method_bind(class_name._native_ptr(), godot::StringName("init_ref")._native_ptr(), class_hash);
4444
reference_ptr_call =
45-
gde_classdb_get_method_bind(class_name._native_ptr(), godot::StringName("reference")._native_ptr(), 2240911060);
45+
gde_classdb_get_method_bind(class_name._native_ptr(), godot::StringName("reference")._native_ptr(), class_hash);
4646
unreference_ptr_call =
47-
gde_classdb_get_method_bind(class_name._native_ptr(), godot::StringName("unreference")._native_ptr(), 2240911060);
47+
gde_classdb_get_method_bind(class_name._native_ptr(), godot::StringName("unreference")._native_ptr(), class_hash);
4848
get_reference_count_ptr_call = gde_classdb_get_method_bind(
4949
class_name._native_ptr(), godot::StringName("get_reference_count")._native_ptr(), 3905245786);
5050
}

src/dart/godot_dart/lib/src/core/gdextension_ffi_bindings.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2313,6 +2313,8 @@ const int __GLIBC_USE_DEPRECATED_GETS = 0;
23132313

23142314
const int __GLIBC_USE_DEPRECATED_SCANF = 0;
23152315

2316+
const int __GLIBC_USE_C2X_STRTOL = 1;
2317+
23162318
const int _STDC_PREDEF_H = 1;
23172319

23182320
const int __STDC_IEC_559__ = 1;
@@ -2329,7 +2331,7 @@ const int __GNU_LIBRARY__ = 6;
23292331

23302332
const int __GLIBC__ = 2;
23312333

2332-
const int __GLIBC_MINOR__ = 35;
2334+
const int __GLIBC_MINOR__ = 39;
23332335

23342336
const int _SYS_CDEFS_H = 1;
23352337

@@ -2385,6 +2387,8 @@ const int _BITS_STDINT_INTN_H = 1;
23852387

23862388
const int _BITS_STDINT_UINTN_H = 1;
23872389

2390+
const int _BITS_STDINT_LEAST_H = 1;
2391+
23882392
const int INT8_MIN = -128;
23892393

23902394
const int INT16_MIN = -32768;

tools/binding_generator/lib/src/generators/engine_type_generator.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,12 @@ void _writeSignals(CodeSink o, GodotExtensionApiJsonClass classInfo) {
124124
// call instead.
125125
final signalVarName = signal.name.toLowerCamelCase();
126126
if (numArgs == 0) {
127-
o.p('final late $signalVarName = Signal0(this, \'${signal.name}\');;');
127+
o.p('late final $signalVarName = Signal0(this, \'${signal.name}\');');
128128
} else {
129129
final arguments = signal.arguments!;
130130
final argTypeList =
131131
arguments.map((e) => godotTypeToDartType(e.type)).join(', ');
132-
o.p('final late $signalVarName = Signal$numArgs<$argTypeList>(this, \'${signal.name}\');');
132+
o.p('late final $signalVarName = Signal$numArgs<$argTypeList>(this, \'${signal.name}\');');
133133
}
134134
}
135135
o.nl();

0 commit comments

Comments
 (0)