From 457654fde52c32825f8c591fe3f5b77d74944f17 Mon Sep 17 00:00:00 2001
From: heck <heck@pep.foundation>
Date: Tue, 1 Mar 2022 21:56:54 +0100
Subject: [PATCH] Build: windows - manual merge of PR#15 from thomas (due to
 conflicts)

---
 build-windows/generate_code.cmd     | 10 +++++-----
 build-windows/pEpJNIAdapter.vcxproj |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build-windows/generate_code.cmd b/build-windows/generate_code.cmd
index 50817d2..96d9256 100644
--- a/build-windows/generate_code.cmd
+++ b/build-windows/generate_code.cmd
@@ -35,16 +35,16 @@ IF %ERRORLEVEL% NEQ 0 GOTO end
 CD ..
 CD java
 
-javac -encoding UTF-8 -d "%java_build_root%" -h ..\cxx %java_pkg_basename%\*.java
+"%JAVA_HOME%\bin\javac" -encoding UTF-8 -d "%java_build_root%" -h ..\cxx %java_pkg_basename%\*.java
 IF %ERRORLEVEL% NEQ 0 GOTO end
-javac -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\*.java
+"%JAVA_HOME%\bin\javac" -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\*.java
 IF %ERRORLEVEL% NEQ 0 GOTO end
-javac -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\exceptions\*.java
+"%JAVA_HOME%\bin\javac" -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\exceptions\*.java
 IF %ERRORLEVEL% NEQ 0 GOTO end
-javac -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\interfaces\*.java
+"%JAVA_HOME%\bin\javac" -encoding UTF-8 -d "%java_build_root%" %java_pkg_basename%\interfaces\*.java
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
-"C:\Program Files\Java\jdk-16\bin\jar" -cvf "%java_build_root%\pEp.jar" -C "%java_build_root%" foundation
+"%JAVA_HOME%\bin\jar" -cvf "%java_build_root%\pEp.jar" -C "%java_build_root%" foundation
 IF %ERRORLEVEL% NEQ 0 GOTO end
 
 :end
diff --git a/build-windows/pEpJNIAdapter.vcxproj b/build-windows/pEpJNIAdapter.vcxproj
index a2484a4..8e7aa6b 100644
--- a/build-windows/pEpJNIAdapter.vcxproj
+++ b/build-windows/pEpJNIAdapter.vcxproj
@@ -89,7 +89,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>C:\Program Files\Java\jdk-16\include\win32;C:\Program Files\Java\jdk-16\include;$(ProjectDir)..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%JAVA_HOME%\include\win32;%JAVA_HOME%\include;$(ProjectDir)..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -114,7 +114,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
-      <AdditionalIncludeDirectories>C:\Program Files\Java\jdk-16\include\win32;C:\Program Files\Java\jdk-16\include;$(ProjectDir)..\..\</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%JAVA_HOME%\include\win32;%JAVA_HOME%\include;$(ProjectDir)..\..\</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>