Merge pull request #50 from Berstanio/fix/minor-improvements

Fix intendation on generated ant files
libgdx · Dec 18, 2023 · 2bb9bbf · 2bb9bbf
2 parents 4c011de + 3c23085
commit 2bb9bbf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/AntScriptGenerator.java b/gdx-jnigen/src/main/java/com/badlogic/gdx/jnigen/AntScriptGenerator.java
@@ -231,11 +231,11 @@ private String generateBuildTargetTemplate (BuildConfig config, BuildTarget targ
 		template = template.replace("%linkerFlags%", target.linkerFlags);
 		template = template.replace("%archiverFlags%", target.archiverFlags);
 		template = template.replace("%libraries%", target.libraries);
-		template = template.replace("%cIncludes%", cIncludes);
-		template = template.replace("%cExcludes%", cExcludes);
-		template = template.replace("%cppIncludes%", cppIncludes);
-		template = template.replace("%cppExcludes%", cppExcludes);
-		template = template.replace("%headerDirs%", headerDirs);
+		template = template.replace("%cIncludes%", cIncludes.toString().trim());
+		template = template.replace("%cExcludes%", cExcludes.toString().trim());
+		template = template.replace("%cppIncludes%", cppIncludes.toString().trim());
+		template = template.replace("%cppExcludes%", cppExcludes.toString().trim());
+		template = template.replace("%headerDirs%", headerDirs.toString().trim());
 		template = template.replace("%precompile%", target.preCompileTask == null ? "" : target.preCompileTask);
 		template = template.replace("%postcompile%", target.postCompileTask == null ? "" : target.postCompileTask);
 

diff --git a/gdx-jnigen/src/test/java/com/badlogic/gdx/jnigen/JniGenTest.java b/gdx-jnigen/src/test/java/com/badlogic/gdx/jnigen/JniGenTest.java
@@ -125,7 +125,7 @@ public void testAll() {
 
         assertTrue(JniGenTestClass.test(
                 true, (byte)1, (char)2, (short)3, 4, 5, 6, 7,
-                buffer, new boolean[] { false }, new char[] { 9 },
+                buffer, new boolean[] { false }, new char[] { '9' },
                 new short[] { 10 }, new int[] { 11 }, new long[] { 12 },
                 new float[] { 13 }, new double[] { 14 },
                 null, "Hurray", JniGenTestClass.class, new RuntimeException(), new JniGenTestClass()));

diff --git a/gdx-jnigen/src/test/java/com/badlogic/gdx/jnigen/JniGenTestClass.java b/gdx-jnigen/src/test/java/com/badlogic/gdx/jnigen/JniGenTestClass.java
@@ -53,7 +53,7 @@ public static native boolean test (boolean boolArg, byte byteArg, char charArg,
 			printf("char[0]: %c\n", charArray [0]);
 			printf("short[0]: %d\n", shortArray [0]);
 			printf("int[0]: %d\n", intArray [0]);
-			printf("long[0]: %ll\n", longArray [0]);
+			printf("long[0]: %lld\n", longArray [0]);
 			printf("float[0]: %f\n", floatArray [0]);
 			printf("double[0]: %f\n", doubleArray [0]);
 			printf("string: %s fuck this nuts\n", string);