Skip to content

Commit a9f691e

Browse files
committed
Various fixes in the compilation
1 parent 5676189 commit a9f691e

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

β€Žsrc/godot/builtins_pxd/member.pxd.j2β€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cdef inline void _setitem(self, object key, {{ builtin.indexing_return_type.cy_t
6969

7070
{% macro render_getsetitem_indexed_array(builtin) %}
7171
cdef inline {{ builtin.indexing_return_type.cy_type }} _getitem(self, GDExtensionInt index):
72-
cdef gd_variant_t *item = <const gd_variant_t *>pythonscript_gdextension.array_operator_index_const(&self._gd_data, index)
72+
cdef const gd_variant_t *item = <const gd_variant_t *>pythonscript_gdextension.array_operator_index_const(&self._gd_data, index)
7373
if item != NULL:
7474
return gd_variant_copy_into_pyobj(item)
7575
else:

β€Žsrc/godot/hazmat/extension_class.pxdβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ cdef inline GDExtensionClassMethodArgumentMetadata _extension_class_method_get_a
253253
cdef inline void _method_call_func(
254254
void* p_method_userdata,
255255
GDExtensionClassInstancePtr p_instance,
256-
GDExtensionVariantPtr* p_args,
256+
const GDExtensionConstVariantPtr* p_args,
257257
GDExtensionInt p_argument_count,
258258
GDExtensionVariantPtr r_return,
259259
GDExtensionCallError* r_error
@@ -307,7 +307,7 @@ cdef inline void register_extension_class_method(
307307
info.return_value_info = &return_value_info
308308
info.return_value_metadata = _extension_class_method_get_argument_metadata(info.method_userdata, -1) # GDExtensionClassMethodArgumentMetadata
309309

310-
info.argument_count = len(arguments_type) # uint32_t
310+
info.argument_count = <uint32_t>len(arguments_type) # uint32_t
311311

312312
# TODO: I'm too lazy to use malloc here for the moment
313313
assert info.argument_count < 16

β€Žsrc/godot/hazmat/gdapi_pxd/meth.pxd.j2β€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
{% macro render_utility_function_signature(builtin) -%}
2828
{% if builtin.is_vararg %}
29-
{{ "void" if builtin.return_type.is_nil else "gd_variant_t" }} gd_utility_{{ builtin.original_name }}(gd_variant_t *args, GDExtensionInt args_count)
29+
{{ "void" if builtin.return_type.is_nil else "gd_variant_t" }} gd_utility_{{ builtin.original_name }}(gd_variant_t *args, int args_count)
3030
{%- else %}
3131
{{ "void" if builtin.return_type.is_nil else builtin.return_type.c_type }} gd_utility_{{ builtin.original_name }}(
3232
{{- render_args_signature(builtin.arguments) -}}

β€Žsrc/godot/hazmat/meson.buildβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ custom_target(
4545

4646
# gdnative_ptrs.so
4747
# └─ gdnative_ptrs.c
48-
# β”œβ”€ gdextension.pxd
48+
# β”œβ”€ gdextension_interface.pxd
4949
# β”‚ └─ ...
5050
# └─ gdapi_ptrs.pyx
5151
# └─ extension_api.json

β€Žsrc/godot/meson.buildβ€Ž

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ custom_target(
7777

7878
# builtins.so
7979
# └─ builtins.c
80-
# β”œβ”€ gdextension.pxd
80+
# β”œβ”€ gdextension_interface.pxd
8181
# β”‚ └─ ...
8282
# └─ builtins.pyx
8383
# └─ extension_api.json
@@ -114,7 +114,7 @@ else
114114
endif
115115

116116

117-
# AutoPxd currently strip const qualifier when generating `gdextension.pxd`,
117+
# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
118118
# hence -Wno-discarded-qualifiers
119119
if host_platform.startswith('windows')
120120
builtins_c_args = []
@@ -138,7 +138,7 @@ shared_library(
138138

139139
# classes.so
140140
# └─ classes.c
141-
# β”œβ”€ gdextension.pxd
141+
# β”œβ”€ gdextension_interface.pxd
142142
# β”‚ └─ ...
143143
# └─ classes.pyx
144144
# └─ extension_api.json
@@ -173,7 +173,7 @@ endif
173173

174174
# Cython's cdef inline methods are turned into static inline C functions that
175175
# produced `defined but not used` errors, hence the `-Wno-unused-function`
176-
# AutoPxd currently strip const qualifier when generating `gdextension.pxd`,
176+
# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
177177
# hence -Wno-discarded-qualifiers
178178
if host_platform.startswith('windows')
179179
classes_c_args = []

β€Žsrc/meson.buildβ€Ž

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ generate_tmpl_cmd = [
5151
# see https://github.com/mesonbuild/meson/issues/2320#issuecomment-1147929155
5252

5353

54-
# godot/hazmat/gdextension.pxd
54+
# godot/hazmat/gdextension_interface.pxd
5555
# └─ gdextension.h
5656

5757
# Convert the header file frome C to Cython
@@ -180,7 +180,7 @@ endforeach
180180
# β”œβ”€ godot/hazmat/gdapi.pxd
181181
# β”œβ”€ godot/builtins.pxd
182182
# | └─ ...
183-
# └─ godot/hazmat/gdextension.pxd
183+
# └─ godot/hazmat/gdextension_interface.pxd
184184
# └─ ...
185185

186186

@@ -274,7 +274,7 @@ endif
274274

275275
# Cython's cdef inline methods are turned into static inline C functions that
276276
# produced `defined but not used` errors, hence the `-Wno-unused-function`
277-
# AutoPxd currently strip const qualifier when generating `gdextension.pxd`,
277+
# AutoPxd currently strip const qualifier when generating `gdextension_interface.pxd`,
278278
# hence -Wno-discarded-qualifiers
279279
if host_platform.startswith('windows')
280280
lib__pythonscript_c_args = []

0 commit comments

Comments
Β (0)