entry symbol macro, Cmake create function consistency

Author: Vano

godot-cppscript.cmake

@@ -3,7 +3,7 @@ find_package(Python3 3.4 REQUIRED)
 set(CPPSCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
 #TODO: make it work in parallel
-function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUTO_METHODS COMPILE_DEFS INCLUDE_PATHS)
+function(create_cppscript_target TARGET_NAME HEADERS_LIST HEADER_NAME HEADERS_DIR GEN_DIR AUTO_METHODS COMPILE_DEFS INCLUDE_PATHS)
 	# Handle empty/NOTFOUND lists
 	if(NOT INCLUDE_PATHS)
 		set(INCLUDE_PATHS "")
@@ -19,11 +19,10 @@ function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUT
 		set(AUTO_METHODS_STR "False")
 	endif()
 
-	file(GLOB_RECURSE HEADERS_LIST RELATIVE ${HEADERS_DIR} ${HEADERS_DIR}/*.hpp)
-	
 	foreach(PATH ${HEADERS_LIST})
+		file(RELATIVE_PATH PATH "${HEADERS_DIR}" "${PATH}")
 		string(REGEX REPLACE "\.hpp$" ".gen.cpp" relative_path "${PATH}")
-		list(APPEND SOURCES_LIST ${GEN_DIR}/${relative_path})
+		list(APPEND SOURCES_LIST "${GEN_DIR}/${relative_path}")
 	endforeach()
 
 	add_custom_command(
@@ -42,16 +41,16 @@ function(create_cppscript_target TARGET_NAME HEADER_NAME HEADERS_DIR GEN_DIR AUT
 			"--definitions" ${COMPILE_DEFS}
 			"--include-paths" ${CPPSCRIPT_DIR}/src ${HEADERS_DIR} ${INCLUDE_PATHS}
 			"--"
-			${CPPSCRIPT_HEADERS}
+			${HEADERS_LIST}
 
-		DEPENDS ${CPPSCRIPT_HEADERS}
+		DEPENDS ${HEADERS_LIST}
 		WORKING_DIRECTORY ${CPPSCRIPT_DIR}
 		VERBATIM
 		COMMAND_EXPAND_LISTS
 		COMMENT "Parsing header files..."
 	)
 
 	target_sources(${TARGET_NAME} PRIVATE ${SOURCES_LIST})
-	target_include_directories(${TARGET_NAME} PUBLIC ${HEADERS_DIR} ${CPPSCRIPT_DIR}/src)
+	target_include_directories(${TARGET_NAME} PUBLIC ${CPPSCRIPT_DIR}/src ${HEADERS_DIR})
 endfunction()
 

templates/register_types.cpp.in

@@ -53,7 +53,7 @@ void LIBRARY_DEINIT_FUNC(ModuleInitializationLevel p_level) {
 
 extern "C" {
 // GDExtension initialization
-GDExtensionBool GDE_EXPORT scripts_library_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
+GDExtensionBool GDE_EXPORT LIBRARY_ENTRY_SYMBOL_FUNC(GDExtensionInterfaceGetProcAddress p_get_proc_address, GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization) {
 	godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);
 
 	init_obj.register_initializer(LIBRARY_INIT_FUNC);

templates/register_types.h.in

@@ -9,6 +9,7 @@
 
 #define LIBRARY_INIT_FUNC initialize_ ## LIBRARY_NAME ## _module
 #define LIBRARY_UNINIT_FUNC uninitialize_ ## LIBRARY_NAME ## _module
+#define LIBRARY_ENTRY_SYMBOL_FUNC LIBRARY_NAME ## _library_init
 
 void LIBRARY_INIT_FUNC(godot::ModuleInitializationLevel p_level);
 void LIBRARY_UNINIT_FUNC(godot::ModuleInitializationLevel p_level);