pEp.foundation
/
pEpJNIAdapter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Build: windows - manual merge of PR#15 from thomas (due to conflicts)

JNI-177
heck 3 years ago
parent
852f0f22df
commit
457654fde5
2 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      build-windows/generate_code.cmd
  2. 4
      build-windows/pEpJNIAdapter.vcxproj

10
build-windows/generate_code.cmd
View File

@ -35,16 +35,16 @@ IF %ERRORLEVEL% NEQ 0 GOTO end
CD .. CD ..
CD java 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 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 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 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 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 IF %ERRORLEVEL% NEQ 0 GOTO end
:end :end

4
build-windows/pEpJNIAdapter.vcxproj
View File

@ -89,7 +89,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile> <PrecompiledHeaderFile>
</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> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>
@ -114,7 +114,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader> <PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile> <PrecompiledHeaderFile>
</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> </ClCompile>
<Link> <Link>
<SubSystem>Windows</SubSystem> <SubSystem>Windows</SubSystem>

Write Preview
Loading…
Cancel
Save