diff --git a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy index aa1e85f..8e26f82 100644 --- a/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy +++ b/buildSrc/src/main/groovy/imgui/generate/GenerateLibs.groovy @@ -30,11 +30,23 @@ class GenerateLibs extends DefaultTask { // Generate platform dependant ant configs and header files def buildConfig = new BuildConfig('imgui-java', tmpFolder, libsFolder, jniDir) + + def win32 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.Windows, false) + win32.compilerPrefix = 'mingw32-' def win64 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.Windows, true) - new AntScriptGenerator().generate(buildConfig, win64) + + def linux32 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.Linux, false) + def linux64 = BuildTarget.newDefaultTarget(BuildTarget.TargetOs.Linux, true) + + new AntScriptGenerator().generate(buildConfig, win32, win64) // Generate native libraries + // Comment/uncomment lines with OS you need. + + BuildExecutor.executeAnt(jniDir + '/build-windows32.xml', '-v', '-Dhas-compiler=true', '-Drelease=true', 'clean', 'postcompile') BuildExecutor.executeAnt(jniDir + '/build-windows64.xml', '-v', '-Dhas-compiler=true', '-Drelease=true', 'clean', 'postcompile') + //BuildExecutor.executeAnt(jniDir + '/build-linux32.xml', '-v', '-Dhas-compiler=true', '-Drelease=true', 'clean', 'postcompile') + //BuildExecutor.executeAnt(jniDir + '/build-linux64.xml', '-v', '-Dhas-compiler=true', '-Drelease=true', 'clean', 'postcompile') BuildExecutor.executeAnt(jniDir + '/build.xml', '-v', 'pack-natives') // Ant creates this folder in the root of the project. Since it will be empty we delete it diff --git a/imgui-binding/src/main/java/imgui/ImDrawData.java b/imgui-binding/src/main/java/imgui/ImDrawData.java index 938a92d..6d67974 100644 --- a/imgui-binding/src/main/java/imgui/ImDrawData.java +++ b/imgui-binding/src/main/java/imgui/ImDrawData.java @@ -44,6 +44,7 @@ public final class ImDrawData { } /*JNI + #include #include jfieldID totalVtxCountID; @@ -153,7 +154,7 @@ public final class ImDrawData { for (int cmd_i = 0; cmd_i < imDrawCmdList.Size; cmd_i++) { const ImDrawCmd* pcmd = &imDrawCmdList[cmd_i]; - float textureID = (float)(intptr_t)pcmd->TextureId; + float textureID = (float)(intptr_t)pcmd->TextureId; float tempArray [6] = { pcmd->ElemCount, pcmd->ClipRect.x, pcmd->ClipRect.y, diff --git a/imgui-binding/src/main/java/imgui/ImGui.java b/imgui-binding/src/main/java/imgui/ImGui.java index 3cb58d5..40e6391 100644 --- a/imgui-binding/src/main/java/imgui/ImGui.java +++ b/imgui-binding/src/main/java/imgui/ImGui.java @@ -27,6 +27,7 @@ public final class ImGui { } /*JNI + #include #include #include "jni_common.h" */