change gcc to msvc

xpenatan · Sep 14, 2024 · dd0c57b · dd0c57b
1 parent 4996cf8
commit dd0c57b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/extensions/ImGuiColorTextEdit/textedit-build/src/main/java/imgui/BuildTextEdit.java b/extensions/ImGuiColorTextEdit/textedit-build/src/main/java/imgui/BuildTextEdit.java
@@ -4,7 +4,7 @@
 import com.github.xpenatan.jparser.builder.targets.EmscriptenTarget;
 import com.github.xpenatan.jparser.builder.targets.LinuxTarget;
 import com.github.xpenatan.jparser.builder.targets.MacTarget;
-import com.github.xpenatan.jparser.builder.targets.WindowsTarget;
+import com.github.xpenatan.jparser.builder.targets.WindowsMSVCTarget;
 import com.github.xpenatan.jparser.builder.tool.BuildToolListener;
 import com.github.xpenatan.jparser.builder.tool.BuildToolOptions;
 import com.github.xpenatan.jparser.builder.tool.BuilderTool;
@@ -59,7 +59,7 @@ private static BuildMultiTarget getWindowTarget(BuildToolOptions op, String imgu
 
         BuildMultiTarget multiTarget = new BuildMultiTarget();
 
-        WindowsTarget windowsTarget = new WindowsTarget();
+        WindowsMSVCTarget windowsTarget = new WindowsMSVCTarget();
         windowsTarget.isStatic = true;
         windowsTarget.headerDirs.add("-I" + imguiBuildPath + "/src/imgui");
         windowsTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/textedit/");

diff --git a/extensions/imgui-node-editor/nodeeditor-build/src/main/java/imgui/BuildNodeEditor.java b/extensions/imgui-node-editor/nodeeditor-build/src/main/java/imgui/BuildNodeEditor.java
@@ -4,7 +4,7 @@
 import com.github.xpenatan.jparser.builder.targets.EmscriptenTarget;
 import com.github.xpenatan.jparser.builder.targets.LinuxTarget;
 import com.github.xpenatan.jparser.builder.targets.MacTarget;
-import com.github.xpenatan.jparser.builder.targets.WindowsTarget;
+import com.github.xpenatan.jparser.builder.targets.WindowsMSVCTarget;
 import com.github.xpenatan.jparser.builder.tool.BuildToolListener;
 import com.github.xpenatan.jparser.builder.tool.BuildToolOptions;
 import com.github.xpenatan.jparser.builder.tool.BuilderTool;
@@ -59,7 +59,7 @@ private static BuildMultiTarget getWindowTarget(BuildToolOptions op, String imgu
 
         BuildMultiTarget multiTarget = new BuildMultiTarget();
 
-        WindowsTarget windowsTarget = new WindowsTarget();
+        WindowsMSVCTarget windowsTarget = new WindowsMSVCTarget();
         windowsTarget.isStatic = true;
         windowsTarget.headerDirs.add("-I" + imguiBuildPath + "/src/imgui");
         windowsTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/nodeeditor/");

diff --git a/extensions/imlayout/imlayout-build/src/main/java/imgui/BuildImLayout.java b/extensions/imlayout/imlayout-build/src/main/java/imgui/BuildImLayout.java
@@ -4,7 +4,7 @@
 import com.github.xpenatan.jparser.builder.targets.EmscriptenTarget;
 import com.github.xpenatan.jparser.builder.targets.LinuxTarget;
 import com.github.xpenatan.jparser.builder.targets.MacTarget;
-import com.github.xpenatan.jparser.builder.targets.WindowsTarget;
+import com.github.xpenatan.jparser.builder.targets.WindowsMSVCTarget;
 import com.github.xpenatan.jparser.builder.tool.BuildToolListener;
 import com.github.xpenatan.jparser.builder.tool.BuildToolOptions;
 import com.github.xpenatan.jparser.builder.tool.BuilderTool;
@@ -60,7 +60,7 @@ private static BuildMultiTarget getWindowTarget(BuildToolOptions op, String imgu
 
         BuildMultiTarget multiTarget = new BuildMultiTarget();
 
-        WindowsTarget windowsTarget = new WindowsTarget();
+        WindowsMSVCTarget windowsTarget = new WindowsMSVCTarget();
         windowsTarget.isStatic = true;
         windowsTarget.headerDirs.add("-I" + imguiCppPath + "/src/imgui");
         windowsTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/imlayout/");

diff --git a/imgui-ext/ext-build/src/main/java/imgui/BuildImGuiExtensions.java b/imgui-ext/ext-build/src/main/java/imgui/BuildImGuiExtensions.java
@@ -4,7 +4,7 @@
 import com.github.xpenatan.jparser.builder.targets.EmscriptenTarget;
 import com.github.xpenatan.jparser.builder.targets.LinuxTarget;
 import com.github.xpenatan.jparser.builder.targets.MacTarget;
-import com.github.xpenatan.jparser.builder.targets.WindowsTarget;
+import com.github.xpenatan.jparser.builder.targets.WindowsMSVCTarget;
 import com.github.xpenatan.jparser.builder.tool.BuildToolListener;
 import com.github.xpenatan.jparser.builder.tool.BuildToolOptions;
 import com.github.xpenatan.jparser.builder.tool.BuilderTool;
@@ -64,35 +64,35 @@ private static BuildMultiTarget getWindowTarget(BuildToolOptions op, String exte
 
         BuildMultiTarget multiTarget = new BuildMultiTarget();
 
-        WindowsTarget glueTarget = new WindowsTarget();
+        WindowsMSVCTarget glueTarget = new WindowsMSVCTarget();
         glueTarget.libDirSuffix += "ext/";
         glueTarget.addJNIHeaders();
         glueTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/imgui/");
         glueTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/jniglue");
-        glueTarget.linkerFlags.add(libBuildCPPPath + "/libs/windows/imgui64_.a");
+        glueTarget.linkerFlags.add(libBuildCPPPath + "/libs/windows/vc/imgui64_.lib");
         glueTarget.cppInclude.add(libBuildCPPPath + "/src/jniglue/JNIGlue.cpp");
 
         {
             // ImLayout extension
             String imlayoutCPPPath = extensionsPath + "/imlayout/imlayout-build/build/c++";
             glueTarget.headerDirs.add("-I" + imlayoutCPPPath + "/src/imlayout/");
-            glueTarget.linkerFlags.add(imlayoutCPPPath + "/libs/windows/imlayout64_.a");
-            glueTarget.headerDirs.add("-include" + imlayoutCPPPath + "/src/jniglue/JNIGlue.h");
+            glueTarget.linkerFlags.add(imlayoutCPPPath + "/libs/windows/vc/imlayout64_.lib");
+            glueTarget.headerDirs.add("/FI" + "\"" + imlayoutCPPPath + "/src/jniglue/JNIGlue.h" + "\"");
         }
         {
             // ImGuiColorTextEdit extension
             String textEditCPPPath = extensionsPath + "/ImGuiColorTextEdit/textedit-build/build/c++";
             glueTarget.headerDirs.add("-I" + textEditCPPPath + "/src/textedit/");
             glueTarget.headerDirs.add("-I" + textEditCPPPath + "/src/textedit/vendor/regex/include");
-            glueTarget.linkerFlags.add(textEditCPPPath + "/libs/windows/textedit64_.a");
-            glueTarget.headerDirs.add("-include" + textEditCPPPath + "/src/jniglue/JNIGlue.h");
+            glueTarget.linkerFlags.add(textEditCPPPath + "/libs/windows/vc/textedit64_.lib");
+            glueTarget.headerDirs.add("/FI" + "\"" + textEditCPPPath + "/src/jniglue/JNIGlue.h" + "\"");
         }
         {
             // imgui-node-editor extension
             String nodeeditorCPPPath = extensionsPath + "/imgui-node-editor/nodeeditor-build/build/c++";
             glueTarget.headerDirs.add("-I" + nodeeditorCPPPath + "/src/nodeeditor/");
-            glueTarget.linkerFlags.add(nodeeditorCPPPath + "/libs/windows/nodeeditor64_.a");
-            glueTarget.headerDirs.add("-include" + nodeeditorCPPPath + "/src/jniglue/JNIGlue.h");
+            glueTarget.linkerFlags.add(nodeeditorCPPPath + "/libs/windows/vc/nodeeditor64_.lib");
+            glueTarget.headerDirs.add("/FI" + "\"" + nodeeditorCPPPath + "/src/jniglue/JNIGlue.h" + "\"");
         }
 
         multiTarget.add(glueTarget);

diff --git a/imgui-ext/ext-desktop/build.gradle.kts b/imgui-ext/ext-desktop/build.gradle.kts
@@ -1,7 +1,7 @@
 val moduleName = "imgui-ext-desktop"
 
 val imguiDir = "${rootProject.projectDir}/imgui"
-val windowsFile = "$imguiDir/imgui-build/build/c++/libs/windows/ext/imgui64.dll"
+val windowsFile = "$imguiDir/imgui-build/build/c++/libs/windows/vc/ext/imgui64.dll"
 val linuxFile = "$imguiDir/imgui-build/build/c++/libs/linux/ext/libimgui64.so"
 val macFile = "$imguiDir/imgui-build/build/c++/libs/mac/ext/libimgui64.dylib"
 val macArmFile = "$imguiDir/imgui-build/build/c++/libs/mac/arm/ext/libimguiarm64.dylib"

diff --git a/imgui/imgui-build/src/main/java/BuildImGui.java b/imgui/imgui-build/src/main/java/BuildImGui.java
@@ -3,7 +3,7 @@
 import com.github.xpenatan.jparser.builder.targets.EmscriptenTarget;
 import com.github.xpenatan.jparser.builder.targets.LinuxTarget;
 import com.github.xpenatan.jparser.builder.targets.MacTarget;
-import com.github.xpenatan.jparser.builder.targets.WindowsTarget;
+import com.github.xpenatan.jparser.builder.targets.WindowsMSVCTarget;
 import com.github.xpenatan.jparser.builder.tool.BuildToolListener;
 import com.github.xpenatan.jparser.builder.tool.BuildToolOptions;
 import com.github.xpenatan.jparser.builder.tool.BuilderTool;
@@ -53,17 +53,17 @@ private static BuildMultiTarget getWindowTarget(BuildToolOptions op) {
         BuildMultiTarget multiTarget = new BuildMultiTarget();
 
         // Make a static library
-        WindowsTarget windowsTarget = new WindowsTarget();
+        WindowsMSVCTarget windowsTarget = new WindowsMSVCTarget();
         windowsTarget.isStatic = true;
         windowsTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/imgui/");
         windowsTarget.cppInclude.add(libBuildCPPPath + "/**/imgui/*.cpp");
         multiTarget.add(windowsTarget);
 
         // Compile glue code and link
-        WindowsTarget linkTarget = new WindowsTarget();
+        WindowsMSVCTarget linkTarget = new WindowsMSVCTarget();
         linkTarget.addJNIHeaders();
         linkTarget.headerDirs.add("-I" + libBuildCPPPath + "/src/imgui/");
-        linkTarget.linkerFlags.add(libBuildCPPPath + "/libs/windows/imgui64_.a");
+        linkTarget.linkerFlags.add(libBuildCPPPath + "/libs/windows/vc/imgui64_.lib");
         linkTarget.cppInclude.add(libBuildCPPPath + "/src/jniglue/JNIGlue.cpp");
         multiTarget.add(linkTarget);
 

diff --git a/imgui/imgui-desktop/build.gradle.kts b/imgui/imgui-desktop/build.gradle.kts
@@ -1,7 +1,7 @@
 val moduleName = "imgui-desktop"
 
 val imguiDir = "${rootProject.projectDir}/imgui"
-val windowsFile = "$imguiDir/imgui-build/build/c++/libs/windows/imgui64.dll"
+val windowsFile = "$imguiDir/imgui-build/build/c++/libs/windows/vc/imgui64.dll"
 val linuxFile = "$imguiDir/imgui-build/build/c++/libs/linux/libimgui64.so"
 val macArmFile = "$imguiDir/imgui-build/build/c++/libs/mac/arm/libimguiarm64.dylib"
 val macFile = "$imguiDir/imgui-build/build/c++/libs/mac/libimgui64.dylib"