Merge fe25e221a5 into 3f44e9b404

Merge pull request #1339 from aaronfranke/detect-gdext
Allow detecting when building as a GDExtension
2023-12-31 08:26:05 -07:00 · 2023-12-29 14:14:35 -06:00 · 2023-12-18 09:13:20 -06:00 · 2023-12-05 17:36:54 +01:00 · 2023-12-05 16:26:25 +01:00
2 changed files with 4 additions and 1 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -163,7 +163,7 @@ target_compile_definitions(${PROJECT_NAME} PUBLIC
 		DEBUG_ENABLED
 		DEBUG_METHODS_ENABLED
 	>
-	$<${compiler_is_msvc}:
+	$<$<AND:$<BOOL:${WIN32}>,$<NOT:${compiler_is_gnu}>>:
 		TYPED_METHOD_BIND
 	>
 )
--- a/tools/godotcpp.py
+++ b/tools/godotcpp.py
@ -295,6 +295,9 @@ def generate(env):
    if env["precision"] == "double":
        env.Append(CPPDEFINES=["REAL_T_IS_DOUBLE"])

+    # Allow detecting when building as a GDExtension.
+    env.Append(CPPDEFINES=["GDEXTENSION"])
+
    # Suffix
    suffix = ".{}.{}".format(env["platform"], env["target"])
    if env.dev_build:
Author	SHA1	Message	Date
Bo	e004019c36	Merge `fe25e221a5` into `3f44e9b404`	2023-12-31 08:26:05 -07:00
David Snopek	3f44e9b404	Merge pull request #1339 from aaronfranke/detect-gdext Allow detecting when building as a GDExtension	2023-12-29 14:14:35 -06:00
Aaron Franke	e17c7bf530	Allow detecting when building as a GDExtension	2023-12-18 09:13:20 -06:00
Bo	fe25e221a5	Fix indentation Co-authored-by: A Thousand Ships <96648715+AThousandShips@users.noreply.github.com>	2023-12-05 17:36:54 +01:00
Bohumil Homola	64f0a6150d	Expanding CMake to other compilers other than MSVC on Windows platform	2023-12-05 16:26:25 +01:00