Sync with 433d1bc

Author: Vano

godot_cppscript.cmake

@@ -197,6 +197,13 @@ exit(0)
 
 else()
 
+set(CPPSCRIPT_BODY_H "#ifndef @H_GUARD@
+#define @H_GUARD@
+#include \"cppscript_defs.h\"
+#include \"properties.gen.h\"
+#endif // @H_GUARD@
+"
+)
 set(CPPSCRIPT_DEFS_H "#ifndef CPPSCRIPT_HEADER
 #define CPPSCRIPT_HEADER
 
@@ -1529,14 +1536,6 @@ if __name__ == \"__main__\":
 )
 
 
-set(EMBED_CPPSCRIPT_H "#ifndef @H_GUARD@
-#define @H_GUARD@
-#include <cppscript_defs.h>
-#include \"properties.gen.h\"
-#endif // @H_GUARD@
-"
-)
-
 #TODO: make it work in parallel
 function(create_cppscript_target)
 	set(options AUTO_METHODS)
@@ -1591,8 +1590,8 @@ function(create_cppscript_target)
 
 	 string(TOUPPER "${CPPS_HEADER_NAME}" H_GUARD_STR)
 	 string(REPLACE "." "_" H_GUARD_STR "${H_GUARD_STR}")
-	 string(REPLACE "@H_GUARD@" "${H_GUARD_STR}" EMBED_CPPSCRIPT_H_FORMATTED "${EMBED_CPPSCRIPT_H}") 
-	 file(WRITE "${GODOT_CPPSCRIPT_H_PATH}" "${EMBED_CPPSCRIPT_H_FORMATTED}")
+	 string(REPLACE "@H_GUARD@" "${H_GUARD_STR}" CPPSCRIPT_BODY_H_FORMATTED "${CPPSCRIPT_BODY_H}") 
+	 file(WRITE "${GODOT_CPPSCRIPT_H_PATH}" "${CPPSCRIPT_BODY_H_FORMATTED}")
 
 	foreach(PATH ${CPPS_HEADERS_LIST})
 		file(RELATIVE_PATH PATH "${CPPS_HEADERS_DIR}" "${PATH}")

godot_cppscript.py

@@ -176,6 +176,14 @@
     exit(0)
 
 
+CPPSCRIPT_BODY_H = """
+#ifndef @H_GUARD@
+#define @H_GUARD@
+#include "cppscript_defs.h"
+#include "properties.gen.h"
+#endif // @H_GUARD@
+
+"""
 CPPSCRIPT_DEFS_H = """
 #ifndef CPPSCRIPT_HEADER
 #define CPPSCRIPT_HEADER
@@ -517,7 +525,7 @@ def generate(target, source, env):
 			with open(defs, 'w') as file:
 				file.write(CPPSCRIPT_DEFS_H)
 			with open(godotcpp, 'w') as file:
-				file.write(cppscript_env['code_format'].CPPSCRIPT_BODY.format(cppscript_env['header_name'].replace(' ', '_').replace('.', '_').upper()))
+				file.write(CPPSCRIPT_BODY_H.replace('@H_GUARD@', cppscript_env['header_name'].replace(' ', '_').replace('.', '_').upper()))
 
 		def generate_header_emitter(target, source, env):
 			generated = [env.File(filename_to_gen_filename(str(i), env['cppscript_env'])) for i in source]