[Build] Add a "one include" header files

SpaiR · SpaiR · commit 3725ddf2f95f · 2021-04-10T15:30:00.000+03:00
diff --git a/imgui-binding/src/main/java/imgui/ImDrawData.java b/imgui-binding/src/main/java/imgui/ImDrawData.java
@@ -28,10 +28,7 @@ public ImDrawData(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IM_DRAW_DATA ((ImDrawData*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImDrawList.java b/imgui-binding/src/main/java/imgui/ImDrawList.java
@@ -19,10 +19,7 @@ public ImDrawList(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IM_DRAW_LIST ((ImDrawList*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImFont.java b/imgui-binding/src/main/java/imgui/ImFont.java
@@ -18,10 +18,7 @@ public ImFont(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IM_FONT ((ImFont*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImFontAtlas.java b/imgui-binding/src/main/java/imgui/ImFontAtlas.java
@@ -37,9 +37,7 @@ public ImFontAtlas(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IM_FONT_ATLAS ((ImFontAtlas*)STRUCT_PTR)
 
diff --git a/imgui-binding/src/main/java/imgui/ImFontConfig.java b/imgui-binding/src/main/java/imgui/ImFontConfig.java
@@ -20,10 +20,7 @@ public ImFontConfig() {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IM_FONT_CONFIG ((ImFontConfig*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImFontGlyph.java b/imgui-binding/src/main/java/imgui/ImFontGlyph.java
@@ -15,9 +15,7 @@ public ImFontGlyph(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IM_FONT_GLYPH ((ImFontGlyph*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java
@@ -123,11 +123,7 @@ public static void init() {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_callbacks.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
      */
 
     private static native void nInitJni(); /*
diff --git a/imgui-binding/src/main/java/imgui/ImGuiIO.java b/imgui-binding/src/main/java/imgui/ImGuiIO.java
@@ -16,11 +16,7 @@ public ImGuiIO(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_callbacks.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IO ((ImGuiIO*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGuiListClipper.java b/imgui-binding/src/main/java/imgui/ImGuiListClipper.java
@@ -37,8 +37,7 @@ private ImGuiListClipper() {
     }
 
     /*JNI
-        #include <imgui.h>
-        #include "jni_callbacks.h"
+        #include "_common.h"
      */
 
     /**
diff --git a/imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java b/imgui-binding/src/main/java/imgui/ImGuiOnceUponAFrame.java
@@ -13,7 +13,7 @@ private ImGuiOnceUponAFrame() {
     }
 
     /*JNI
-        #include <imgui.h>
+        #include "_common.h"
      */
 
     public static native boolean get(); /*
diff --git a/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java b/imgui-binding/src/main/java/imgui/ImGuiPlatformIO.java
@@ -79,11 +79,7 @@ public ImGuiPlatformIO(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_callbacks.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_PLATFORM_IO ((ImGuiPlatformIO*)STRUCT_PTR)
 
diff --git a/imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java b/imgui-binding/src/main/java/imgui/ImGuiPlatformMonitor.java
@@ -12,10 +12,7 @@ public ImGuiPlatformMonitor(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_PLATFORM_MONITOR ((ImGuiPlatformMonitor*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGuiStorage.java b/imgui-binding/src/main/java/imgui/ImGuiStorage.java
@@ -21,9 +21,7 @@ public ImGuiStorage(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_STORAGE ((ImGuiStorage*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGuiStyle.java b/imgui-binding/src/main/java/imgui/ImGuiStyle.java
@@ -17,10 +17,7 @@ public ImGuiStyle(final long ptr) {
     }
 
     /*JNI
-        #include <imgui.h>
-        #include <stdint.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_STYLE ((ImGuiStyle*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java b/imgui-binding/src/main/java/imgui/ImGuiTextFilter.java
@@ -19,9 +19,7 @@ public ImGuiTextFilter(final String defaultFilter) {
     }
 
     /*JNI
-        #include <imgui.h>
-        #include <stdint.h>
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_TEXT_FILTER ((ImGuiTextFilter*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGuiViewport.java b/imgui-binding/src/main/java/imgui/ImGuiViewport.java
@@ -15,10 +15,7 @@ public ImGuiViewport(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_VIEWPORT ((ImGuiViewport*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java b/imgui-binding/src/main/java/imgui/ImGuiWindowClass.java
@@ -20,9 +20,7 @@ public ImGuiWindowClass(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include "jni_binding_struct.h"
+        #include "_common.h"
 
         #define IMGUI_WINDOW_CLASS ((ImGuiWindowClass*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodes.java
@@ -18,10 +18,7 @@ private ImNodes() {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include <imnodes.h>
-        #include "jni_common.h"
+        #include "_imnodes.h"
      */
 
     // An editor context corresponds to a set of nodes in a single workspace (created with a single
diff --git a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesContext.java
@@ -11,11 +11,7 @@ public ImNodesContext(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include <imnodes.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_imnodes.h"
 
         #define IMNODES_CONTEXT ((imnodes::EditorContext*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java b/imgui-binding/src/main/java/imgui/extension/imnodes/ImNodesStyle.java
@@ -8,11 +8,7 @@ public ImNodesStyle(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include <imnodes.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_imnodes.h"
 
         #define IMNODES_STYLE ((imnodes::Style*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditor.java
@@ -31,11 +31,7 @@ private NodeEditor() {
     }
 
     /*JNI
-        #include <imgui.h>
-        #include <imgui_node_editor.h>
-        #include <imgui_node_editor_internal.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_nodeeditor.h"
 
         namespace ed = ax::NodeEditor;
      */
diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorConfig.java
@@ -11,11 +11,7 @@ public NodeEditorConfig(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include <imgui_node_editor.h>
-        #include <imgui_node_editor_internal.h>
-        #include "jni_binding_struct.h"
+        #include "_nodeeditor.h"
 
         namespace ed = ax::NodeEditor;
 
diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorContext.java
@@ -15,9 +15,7 @@ public NodeEditorContext(final long ptr) {
     }
 
     /*JNI
-        #include <imgui.h>
-        #include <imgui_node_editor.h>
-        #include "jni_binding_struct.h"
+        #include "_nodeeditor.h"
 
         namespace ed = ax::NodeEditor;
 
diff --git a/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java b/imgui-binding/src/main/java/imgui/extension/nodeditor/NodeEditorStyle.java
@@ -11,12 +11,7 @@ public NodeEditorStyle(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
-        #include <imgui_node_editor.h>
-        #include <imgui_node_editor_internal.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
+        #include "_nodeeditor.h"
 
         namespace ed = ax::NodeEditor;
 
diff --git a/imgui-binding/src/main/java/imgui/internal/ImGui.java b/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 <imgui.h>
+        #include "_common.h"
         #include <imgui_internal.h>
-        #include "jni_common.h"
      */
 
     // Basic Helpers for widget code
diff --git a/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java b/imgui-binding/src/main/java/imgui/internal/ImGuiDockNode.java
@@ -18,11 +18,8 @@ public ImGuiDockNode(final long ptr) {
     }
 
     /*JNI
-        #include <stdint.h>
-        #include <imgui.h>
+        #include "_common.h"
         #include <imgui_internal.h>
-        #include "jni_common.h"
-        #include "jni_binding_struct.h"
 
         #define IMGUI_DOCK_NODE ((ImGuiDockNode*)STRUCT_PTR)
      */
diff --git a/imgui-binding/src/main/native/_base.h b/imgui-binding/src/main/native/_base.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#include <stdint.h>
+#include <imgui.h>
diff --git a/imgui-binding/src/main/native/_binding.h b/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"
diff --git a/imgui-binding/src/main/native/_common.h b/imgui-binding/src/main/native/_common.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "_base.h"
+#include "_binding.h"
diff --git a/imgui-binding/src/main/native/_imnodes.h b/imgui-binding/src/main/native/_imnodes.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "_base.h"
+#include <imnodes.h>
+#include "_binding.h"
diff --git a/imgui-binding/src/main/native/_nodeeditor.h b/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"
diff --git a/imgui-binding/src/main/native/jni_binding_struct.h b/imgui-binding/src/main/native/jni_binding_struct.h
@@ -1,7 +1,6 @@
-#include <jni.h>
+#pragma once
 
-#ifndef JNI_BINDING_STRUCT_H
-#define JNI_BINDING_STRUCT_H
+#include <jni.h>
 
 #ifndef STRUCT_PTR
 #define STRUCT_PTR env->GetLongField(object, Jni::GetBindingStructPtrID())
@@ -13,5 +12,3 @@ namespace Jni
 
     jfieldID GetBindingStructPtrID();
 }
-
-#endif
diff --git a/imgui-binding/src/main/native/jni_callbacks.h b/imgui-binding/src/main/native/jni_callbacks.h
@@ -1,7 +1,6 @@
-#include <jni.h>
+#pragma once
 
-#ifndef JNI_CALLBACK_H
-#define JNI_CALLBACK_H
+#include <jni.h>
 
 namespace Jni
 {
@@ -27,5 +26,3 @@ namespace Jni
 
     jfloat CallImPlatformFuncViewportSuppFloat(JNIEnv* env, jobject func, jobject vp);
 }
-
-#endif
diff --git a/imgui-binding/src/main/native/jni_common.h b/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

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,7 @@ public ImFontAtlas(final long ptr) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/*JNI`
`40`		`- #include <stdint.h>`
`41`		`- #include <imgui.h>`
`42`		`- #include "jni_binding_struct.h"`
	`40`	`+ #include "_common.h"`
`43`	`41`
`44`	`42`	`#define IM_FONT_ATLAS ((ImFontAtlas*)STRUCT_PTR)`
`45`	`43`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,7 @@ public ImFontGlyph(final long ptr) {`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/*JNI`
`18`		`- #include <stdint.h>`
`19`		`- #include <imgui.h>`
`20`		`- #include "jni_binding_struct.h"`
	`18`	`+ #include "_common.h"`
`21`	`19`
`22`	`20`	`#define IM_FONT_GLYPH ((ImFontGlyph*)STRUCT_PTR)`
`23`	`21`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,7 @@ private ImGuiListClipper() {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`/*JNI`
`40`		`- #include <imgui.h>`
`41`		`- #include "jni_callbacks.h"`
	`40`	`+ #include "_common.h"`
`42`	`41`	`*/`
`43`	`42`
`44`	`43`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ private ImGuiOnceUponAFrame() {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`/*JNI`
`16`		`- #include <imgui.h>`
	`16`	`+ #include "_common.h"`
`17`	`17`	`*/`
`18`	`18`
`19`	`19`	`public static native boolean get(); /*`