[Build] Add a "one include" header files

imgui-binding/src/main/java/imgui/ImDrawData.java

@@ -28,10 +28,7 @@ public final class ImDrawData extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IM_DRAW_DATA ((ImDrawData*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImDrawList.java

@@ -19,10 +19,7 @@ public final class ImDrawList extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IM_DRAW_LIST ((ImDrawList*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImFont.java

@@ -18,10 +18,7 @@ public final class ImFont extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IM_FONT ((ImFont*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImFontAtlas.java

@@ -37,9 +37,7 @@ public final class ImFontAtlas extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
 
         #define IM_FONT_ATLAS ((ImFontAtlas*)STRUCT_PTR)
 

imgui-binding/src/main/java/imgui/ImFontConfig.java

@@ -20,10 +20,7 @@ public final class ImFontConfig extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IM_FONT_CONFIG ((ImFontConfig*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImFontGlyph.java

@@ -15,9 +15,7 @@ public final class ImFontGlyph extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
 
         #define IM_FONT_GLYPH ((ImFontGlyph*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGui.java

@@ -123,11 +123,7 @@ public class ImGui {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_callbacks.h"
-        #include "jni_binding_struct.h"
      */
 
     private static native void nInitJni(); /*

imgui-binding/src/main/java/imgui/ImGuiIO.java

@@ -16,11 +16,7 @@ public final class ImGuiIO extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_callbacks.h"
-        #include "jni_binding_struct.h"
 
         #define IO ((ImGuiIO*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGuiListClipper.java

@@ -37,8 +37,7 @@ public final class ImGuiListClipper {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_common.h"
-        #include "jni_callbacks.h"
      */
 
     /**

imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java

@@ -13,7 +13,7 @@ public final class ImGuiOnceUponAFrame {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_common.h"
      */
 
     public static native boolean get(); /*

imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java

@@ -79,11 +79,7 @@ public final class ImGuiPlatformIO extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_callbacks.h"
-        #include "jni_binding_struct.h"
 
         #define IMGUI_PLATFORM_IO ((ImGuiPlatformIO*)STRUCT_PTR)
 

imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java

@@ -12,10 +12,7 @@ public final class ImGuiPlatformMonitor extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMGUI_PLATFORM_MONITOR ((ImGuiPlatformMonitor*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGuiStorage.java

@@ -21,9 +21,7 @@ public final class ImGuiStorage extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
 
         #define IMGUI_STORAGE ((ImGuiStorage*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGuiStyle.java

@@ -17,10 +17,7 @@ public final class ImGuiStyle extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_common.h"
-        #include <stdint.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMGUI_STYLE ((ImGuiStyle*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGuiTextFilter.java

@@ -19,9 +19,7 @@ public final class ImGuiTextFilter extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_common.h"
-        #include <stdint.h>
-        #include "jni_binding_struct.h"
 
         #define IMGUI_TEXT_FILTER ((ImGuiTextFilter*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGuiViewport.java

@@ -15,10 +15,7 @@ public final class ImGuiViewport extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMGUI_VIEWPORT ((ImGuiViewport*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/ImGuiWindowClass.java

@@ -20,9 +20,7 @@ public final class ImGuiWindowClass extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
 
         #define IMGUI_WINDOW_CLASS ((ImGuiWindowClass*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java

@@ -18,10 +18,7 @@ public final class ImNodes {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_imnodes.h"
-        #include <imgui.h>
-        #include <imnodes.h>
-        #include "jni_common.h"
      */
 
     // An editor context corresponds to a set of nodes in a single workspace (created with a single

imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java

@@ -11,11 +11,7 @@ public final class ImNodesContext extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_imnodes.h"
-        #include <imgui.h>
-        #include <imnodes.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMNODES_CONTEXT ((imnodes::EditorContext*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java

@@ -8,11 +8,7 @@ public final class ImNodesStyle extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_imnodes.h"
-        #include <imgui.h>
-        #include <imnodes.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMNODES_STYLE ((imnodes::Style*)STRUCT_PTR)
      */

imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java

@@ -31,11 +31,7 @@ public final class NodeEditor {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_nodeeditor.h"
-        #include <imgui_node_editor.h>
-        #include <imgui_node_editor_internal.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         namespace ed = ax::NodeEditor;
      */

imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java

@@ -11,11 +11,7 @@ public final class NodeEditorConfig extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_nodeeditor.h"
-        #include <imgui.h>
-        #include <imgui_node_editor.h>
-        #include <imgui_node_editor_internal.h>
-        #include "jni_binding_struct.h"
 
         namespace ed = ax::NodeEditor;
 

imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java

@@ -15,9 +15,7 @@ public final class NodeEditorContext extends ImGuiStructDestroyable {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_nodeeditor.h"
-        #include <imgui_node_editor.h>
-        #include "jni_binding_struct.h"
 
         namespace ed = ax::NodeEditor;
 

imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java

@@ -11,12 +11,7 @@ public final class NodeEditorStyle extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_nodeeditor.h"
-        #include <imgui.h>
-        #include <imgui_node_editor.h>
-        #include <imgui_node_editor_internal.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         namespace ed = ax::NodeEditor;
 

imgui-binding/src/main/java/imgui/internal/ImGui.java

@@ -8,10 +8,8 @@ public final class ImGui extends imgui.ImGui {
     private static final ImGuiDockNode DOCK_NODE = new ImGuiDockNode(0);
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
         #include <imgui_internal.h>
-        #include "jni_common.h"
      */
 
     // Basic Helpers for widget code

imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java

@@ -18,11 +18,8 @@ public final class ImGuiDockNode extends ImGuiStruct {
     }
 
     /*JNI
-        #include <stdint.h>
+        #include "_common.h"
-        #include <imgui.h>
         #include <imgui_internal.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMGUI_DOCK_NODE ((ImGuiDockNode*)STRUCT_PTR)
      */

imgui-binding/src/main/native/_base.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#include <stdint.h>
+#include <imgui.h>

imgui-binding/src/main/native/_binding.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "jni_common.h"
+#include "jni_callbacks.h"
+#include "jni_binding_struct.h"

imgui-binding/src/main/native/_common.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#include "_base.h"
+#include "_binding.h"

imgui-binding/src/main/native/_imnodes.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "_base.h"
+#include <imnodes.h>
+#include "_binding.h"

imgui-binding/src/main/native/_nodeeditor.h

@@ -0,0 +1,9 @@
+#pragma once
+
+#include <stdint.h>
+#include <imgui.h>
+#include <imgui_node_editor.h>
+#include <imgui_node_editor_internal.h>
+#include "jni_common.h"
+#include "jni_callbacks.h"
+#include "jni_binding_struct.h"

imgui-binding/src/main/native/jni_binding_struct.h

@@ -1,7 +1,6 @@
-#include <jni.h>
+#pragma once
 
-#ifndef JNI_BINDING_STRUCT_H
+#include <jni.h>
-#define JNI_BINDING_STRUCT_H
 
 #ifndef STRUCT_PTR
 #define STRUCT_PTR env->GetLongField(object, Jni::GetBindingStructPtrID())
@@ -13,5 +12,3 @@ namespace Jni
 
     jfieldID GetBindingStructPtrID();
 }
-
-#endif

imgui-binding/src/main/native/jni_callbacks.h

@@ -1,7 +1,6 @@
-#include <jni.h>
+#pragma once
 
-#ifndef JNI_CALLBACK_H
+#include <jni.h>
-#define JNI_CALLBACK_H
 
 namespace Jni
 {
@@ -27,5 +26,3 @@ namespace Jni
 
     jfloat CallImPlatformFuncViewportSuppFloat(JNIEnv* env, jobject func, jobject vp);
 }
-
-#endif

imgui-binding/src/main/native/jni_common.h

@@ -1,9 +1,8 @@
+#pragma once
+
 #include <jni.h>
 #include <imgui.h>
 
-#ifndef JNI_COMMON_H
-#define JNI_COMMON_H
-
 namespace Jni
 {
     void InitCommon(JNIEnv* env);
@@ -18,5 +17,3 @@ namespace Jni
     void ImVec4Cpy(JNIEnv* env, ImVec4* src, jobject dst);
     void ImVec4Cpy(JNIEnv* env, ImVec4 src, jobject dst);
 }
-
-#endif