Initial conversion

Author: CedNaru

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "godot-cpp"]
+	path = godot-cpp
+	url = https://github.com/godotengine/godot-cpp.git

CMakeLists.txt

@@ -5,7 +5,6 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-set(GODOT_ROOT_DIR ../../)
 
 # Uncomment to pass auto completion in TOOLS mode
 #add_compile_definitions(MONO_GLUE_ENABLED)
@@ -20,17 +19,34 @@ add_compile_definitions(X11_ENABLED)
 #add_compile_definitions(IOS_ENABLED)
 #add_compile_definitions(__ANDROID__)
 
+
+
+
+#Godot-cpp
+file(GLOB_RECURSE GODOT-CPP godot-cpp/*.cpp)
+add_library(godot STATIC ${GODOT-CPP})
+
+
 # Get sources
 file(GLOB_RECURSE SOURCES src/*.c**)
 file(GLOB_RECURSE HEADERS src/*.h**)
+add_library(${PROJECT_NAME} SHARED ${SOURCES} ${HEADERS})
+
+# Includes
+target_include_directories(godot
+        PUBLIC
+        godot-cpp/include
+        godot-cpp/include/godot_cpp
+        godot-cpp/gen/include
+        godot-cpp/gen/include/godot_cpp
+        godot-cpp/gdextension
+)
 
 # JNI
 find_package(JNI REQUIRED)
-
-# Includes
-include_directories(./src)
-include_directories(${GODOT_ROOT_DIR})
 include_directories(${JNI_INCLUDE_DIRS})
 
-# Target
-add_library(${PROJECT_NAME} SHARED register_types.h register_types.cpp ${SOURCES} ${HEADERS})
+target_link_libraries(${PROJECT_NAME}
+        PRIVATE
+        godot
+)

SConstruct

@@ -0,0 +1,85 @@
+import os
+import generate_templates
+
+env = SConscript("godot-cpp/SConstruct")
+java_home = os.environ["JAVA_HOME"]
+
+# Generate templates when building the engine.
+generate_templates.generate_header_from_files("kt/plugins/godot-intellij-plugin/src/main/resources/template", "src/editor/project/templates.h")
+
+# Add those directory manually, so we can skip the godot_cpp directory when including headers in C++ files
+source_path = [
+    os.path.join("godot-cpp", "include","godot_cpp"),
+    os.path.join("godot-cpp", "gen", "include","godot_cpp")
+]
+env.Append(CPPPATH=[env.Dir(d) for d in source_path])
+
+
+# For the reference:
+# - CCFLAGS are compilation flags shared between C and C++
+# - CFLAGS are for C-specific compilation flags
+# - CXXFLAGS are for C++-specific compilation flags
+# - CPPFLAGS are for pre-processor flags
+# - CPPDEFINES are for pre-processor defines
+# - LINKFLAGS are for linking flags
+
+# tweak this if you want to use different folders, or more folders, to store your source code in.
+env.Append(CPPPATH=["src/"])
+sources = [
+    Glob("register_types.cpp"),
+    Glob("src/*.cpp"),
+    Glob("src/jni/*.cpp"),
+    Glob("src/binding/*.cpp"),
+    Glob("src/resource_format/*.cpp"),
+    Glob("src/language/*.cpp"),
+    Glob("src/script/*.cpp"),
+    Glob("src/script/language/*.cpp"),
+    Glob("src/jvm_wrapper/*.cpp"),
+    Glob("src/jvm_wrapper/registration/*.cpp"),
+    Glob("src/jvm_wrapper/bridge/*.cpp"),
+    Glob("src/jvm_wrapper/memory/*.cpp"),
+    Glob("src/lifecycle/*.cpp"),
+    Glob("src/lifecycle/platforms/*.cpp"),
+    ]
+
+if env["target"] in ["editor", "template_debug"]:
+    sources.append(Glob("src/editor/*.cpp"))
+    sources.append(Glob("src/editor/project/*.cpp"))
+    sources.append(Glob("src/editor/build/*.cpp"))
+    sources.append(Glob("src/editor/dialog/*.cpp"))
+    sources.append(Glob("src/editor/panel/*.cpp"))
+
+# Android
+if env["platform"] != "android":
+    java_include_dirs = [
+        java_home + "/include",
+        java_home + "/include/linux",
+        java_home + "/include/win32",
+        java_home + "/include/darwin"
+    ]
+    env.Append(CPPPATH=[java_include_dirs])
+
+
+if env["platform"] == "macos":
+    library = env.SharedLibrary(
+        "bin/godot.jvm.{}.{}.framework/godot.jvm.{}.{}".format(
+            env["platform"], env["target"], env["platform"], env["target"]
+        ),
+        source=sources,
+    )
+elif env["platform"] == "ios":
+    if env["ios_simulator"]:
+        library = env.StaticLibrary(
+            "bin/godot.jvm.{}.{}.simulator.a".format(env["platform"], env["target"]),
+            source=sources,
+        )
+    else:
+        library = env.StaticLibrary(
+            "bin/godot.jvm.{}.{}.a".format(env["platform"], env["target"]),
+            source=sources,
+        )
+else:
+    library = env.SharedLibrary(
+        "bin/godot.jvm.{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
+        source=sources,
+    )

SCsub

@@ -23,7 +23,6 @@ def generate_header_from_files(directory, header_file):
     file_is_binary = []
 
     with open(header_file, 'w') as header:
-        header.write(f'#ifdef TOOLS_ENABLED \n\n')
         header.write(f'// Auto-generated templates from {directory} directory \n\n')
         header.write("#ifndef FILE_CONTENTS_H\n")
         header.write("#define FILE_CONTENTS_H\n\n")
@@ -79,8 +78,6 @@ def generate_header_from_files(directory, header_file):
 
         header.write("#endif // FILE_CONTENTS_H\n\n")
 
-        header.write("#endif// TOOLS_ENABLED\n")
-
     print(f"{header_file} generated successfully.")
 
 if __name__ == "__main__":

generate_templates.py

@@ -1,6 +1,3 @@
-
-#ifdef TOOLS_ENABLED
-
 #include "about_dialog.h"
 
 #include "editor/godot_kotlin_jvm_editor.h"
@@ -57,6 +54,4 @@ void AboutDialog::_notification(int notification) {
         popup_centered();
         set_exclusive(false);
     }
-}
-
-#endif // TOOLS_ENABLED
+}

godot-cpp

@@ -1,6 +1,3 @@
-
-#ifdef TOOLS_ENABLED
-
 #ifndef GODOT_JVM_ABOUT_DIALOG_H
 #define GODOT_JVM_ABOUT_DIALOG_H
 
@@ -19,6 +16,4 @@ class AboutDialog : public AcceptDialog {
     void _notification(int notification);
 };
 
-#endif// GODOT_JVM_ABOUT_DIALOG_H
-
-#endif// TOOLS_ENABLED
+#endif// GODOT_JVM_ABOUT_DIALOG_H

register_types.h

@@ -1,6 +1,3 @@
-
-#ifdef TOOLS_ENABLED
-
 #include "build_dialog.h"
 
 #include "editor/build/gradle_task_runner.h"
@@ -58,6 +55,4 @@ void TaskDialog::_notification(int notification) {
     vertical_container->add_child(progress_bar);
 
     add_child(vertical_container);
-}
-
-#endif // TOOLS_ENABLED
+}