Merge 1a4857cde6 into 0ddef6ed96

Merge pull request #1354 from nightblade9/patch-1
Update README.md with basic pre-requisites
2024-01-14 09:09:21 +03:00 · 2024-01-11 13:11:30 +01:00 · 2024-01-11 13:10:51 +01:00 · 2024-01-11 13:10:07 +01:00 · 2024-01-10 15:29:23 -05:00 · 2024-01-07 15:24:02 +08:00
4 changed files with 13 additions and 6 deletions
--- a/README.md
+++ b/README.md
@ -74,7 +74,10 @@ so formatting is done before your changes are submitted.

 ## Getting started

-It's a bit similar to what it was for 3.x but also a bit different.
+You need the same C++ pre-requisites installed that are required for the `godot` repository. Follow the [official build instructions for your target platform](https://docs.godotengine.org/en/latest/contributing/development/compiling/index.html#building-for-target-platforms).
+
+Getting started with GDExtensions is a bit similar to what it was for 3.x but also a bit different.
+
 This new approach is much more akin to how core Godot modules are structured.

 Compiling this repository generates a static library to be linked with your shared lib,
--- a/8
+++ b/8
@ -20,11 +20,13 @@ except:
 env.PrependENVPath("PATH", os.getenv("PATH"))

 # Custom options and profile flags.
-customs = ["custom.py"]
+
 try:
-    customs += Import("customs")
+    Import("customs")
 except:
-    pass
+    customs = []
+customs += ["custom.py"]
+
 profile = ARGUMENTS.get("profile", "")
 if profile:
    if os.path.isfile(profile):
--- a/binding_generator.py
+++ b/binding_generator.py
@ -1778,9 +1778,9 @@ def generate_global_constant_binds(api, output_dir):
            continue

        if enum_def["is_bitfield"]:
-            header.append(f'VARIANT_BITFIELD_CAST(godot::{enum_def["name"]});')
+            header.append(f'VARIANT_BITFIELD_CAST({enum_def["name"]});')
        else:
-            header.append(f'VARIANT_ENUM_CAST(godot::{enum_def["name"]});')
+            header.append(f'VARIANT_ENUM_CAST({enum_def["name"]});')

    # Variant::Type is not a global enum, but only one line, it is worth to place in this file instead of creating new file.
    header.append(f"VARIANT_ENUM_CAST(godot::Variant::Type);")
@ -2433,6 +2433,7 @@ def get_operator_id_name(op):
        "unary-": "negate",
        "unary+": "positive",
        "%": "module",
+        "**": "power",
        "<<": "shift_left",
        ">>": "shift_right",
        "&": "bit_and",
--- a/include/godot_cpp/variant/variant.hpp
+++ b/include/godot_cpp/variant/variant.hpp
@ -122,6 +122,7 @@ public:
 		OP_NEGATE,
 		OP_POSITIVE,
 		OP_MODULE,
+		OP_POWER,
 		// bitwise
 		OP_SHIFT_LEFT,
 		OP_SHIFT_RIGHT,
Author	SHA1	Message	Date
arcase6	6a4660d501	Merge `1a4857cde6` into `0ddef6ed96`	2024-01-14 09:09:21 +03:00
Rémi Verschelde	0ddef6ed96	Merge pull request #1354 from nightblade9/patch-1 Update README.md with basic pre-requisites	2024-01-11 13:11:30 +01:00
Rémi Verschelde	64529361b4	Merge pull request #1351 from Daylily-Zeleen/daylily-zeleen/remove_namespace_in_global_constants_binding Remove "godot" namespace when binding global constants.	2024-01-11 13:10:51 +01:00
Rémi Verschelde	edf1637c2c	Merge pull request #1349 from AThousandShips/op_fix Add missing `OP_POWER` operator to `Variant`	2024-01-11 13:10:07 +01:00
nightblade9	ee169b201b	Update README.md with basic pre-requisites	2024-01-10 15:29:23 -05:00
Daylily-Zeleen	bd40a94424	Remove "godot" namespace when binding global constants.	2024-01-07 15:24:02 +08:00
A Thousand Ships	f037a697eb	Add missing `OP_POWER` operator to `Variant`	2024-01-06 21:12:52 +01:00
Andrew	1a4857cde6	fix import logic for adding files to customs. Current logic throws exeption when trying to append to customs list because Import function has no return.	2023-12-25 11:29:07 -06:00