From 44c5ca18ca4ad2c9dc9d5ea7ea004b7c827dce33 Mon Sep 17 00:00:00 2001
From: SpaiR <klimbetoo@gmail.com>
Date: Mon, 12 Apr 2021 13:09:38 +0300
Subject: [PATCH] [Build] Make imgui-app to use a freetype version of library
 for Windows

It's absolutely safe to use FreeType for Windows, since dll's are compiled fully statically.
---
 example/build.gradle   | 6 +-----
 imgui-app/build.gradle | 5 ++++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/example/build.gradle b/example/build.gradle
index ab2573e..a7b022c 100644
--- a/example/build.gradle
+++ b/example/build.gradle
@@ -14,11 +14,7 @@ dependencies {
     implementation project(':imgui-app')
 }
 
-task start(type: JavaExec, dependsOn: build) {
-    main = 'Main'
-    classpath = sourceSets.test.runtimeClasspath
-    jvmArgs = ["-Dimgui.library.path=${System.getProperty('libPath', '../bin')}"]
-
+run {
     if (org.gradle.internal.os.OperatingSystem.current().isMacOsX()) {
         jvmArgs += ['-XstartOnFirstThread', '-Djava.awt.headless=true']
     }
diff --git a/imgui-app/build.gradle b/imgui-app/build.gradle
index 73d1df3..d174e19 100644
--- a/imgui-app/build.gradle
+++ b/imgui-app/build.gradle
@@ -31,11 +31,14 @@ dependencies {
 
 jar {
     from('../bin') {
-        include 'imgui-java64.dll'
         include 'libimgui-java64.so'
         include 'libimgui-java64.dylib'
         into 'io/imgui/java/native-bin/'
     }
+    from('../bin/freetype') {
+        include 'imgui-java64.dll'
+        into 'io/imgui/java/native-bin/'
+    }
 }
 
 apply from: "$rootDir/publish.gradle"