From f128bea2c4aeb7c3acd75ab850730111edc163a3 Mon Sep 17 00:00:00 2001 From: Thomas Date: Mon, 5 Jul 2021 09:01:13 +0200 Subject: [PATCH] Complete merge --- build-windows/generate_code.cmd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build-windows/generate_code.cmd b/build-windows/generate_code.cmd index e4cac40..de0f482 100644 --- a/build-windows/generate_code.cmd +++ b/build-windows/generate_code.cmd @@ -38,10 +38,6 @@ javac -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\*.java javac -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\exceptions\*.java javac -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\interfaces\*.java -<<<<<<< HEAD -"C:\Program Files\Java\jdk-16\bin\jar" -cvf ..\..\build\java\pEp.jar -C "%java_build_root%" foundation -======= "C:\Program Files\Java\jdk-16\bin\jar" -cvf ..\build\java\pEp.jar -C "%java_build_root%" foundation ->>>>>>> fd6cbb9 (Add Windows build project and reference platform.h) POPD