[go: up one dir, main page]

Skip to content

Commit

Permalink
fix bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
planetis-m committed Jul 11, 2024
1 parent 4435634 commit 42c8f31
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,10 @@ jobs:
- name: Install dependencies
run: |
choco install wget
choco install openjdk --version=${{ env.JAVA_VERSION }}.*
choco install openjdk --version=${{ env.JAVA_VERSION }}
$JAVA_HOME = "C:\Program Files\OpenJDK\jdk-${{ env.JAVA_VERSION }}"
echo "JAVA_HOME=$JAVA_HOME" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
echo "$env:JAVA_HOME\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Set up Android SDK/NDK
run: |
nimble -d:GitHubCI setupBuildEnv -Y
Expand Down
3 changes: 2 additions & 1 deletion build_android.nims
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ task compile, "Compile raylib project for Android":
" --nimcache:" & nimcacheDir().parentDir / (ProjectName & "_" & $cpu) & " " & ProjectSourceFile)
# Compile project .java code into .class (Java bytecode)
exec(JavaHome / "bin/javac" & " -verbose --source 11 --target 11 -d " & ProjectBuildPath / "obj" &
" --system " & JavaHome & " --class-path " & androidResourcePath & (when defined(windows): ";" else: ":") &
" --system " & quoteShell(JavaHome) & " --class-path " & androidResourcePath &
(when defined(windows): ";" else: ":") &
ProjectBuildPath / "obj" & " --source-path " & ProjectBuildPath / "src" & " " &
ProjectBuildPath / "src/com" / AppCompanyName / AppProductName / "R.java" & " " &
ProjectBuildPath / "src/com" / AppCompanyName / AppProductName / "NativeLoader.java")
Expand Down
3 changes: 3 additions & 0 deletions raylib_game.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@ requires "naylib"
# foreignDep "default-jdk"

# Tasks

# mode = ScriptMode.Verbose

include "build_android.nims"
include "setup_build_env.nims"

Expand Down

0 comments on commit 42c8f31

Please sign in to comment.