Windows/Android: fixing android build issues (#210)

coronalabs · Dec 15, 2020 · 4b59dc8 · 4b59dc8
1 parent f38b928
commit 4b59dc8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -424,7 +424,7 @@ jobs:
         shell: bash
         run: |
           curl -sL https://github.com/coronalabs/binary-data/releases/download/1.0/jre.win32.7z -o jre.win32.7z
-          7z x jre.win32.7z -o"platform\windows\Bin" -y
+          7z x jre.win32.7z -o"platform/windows/Bin" -y
       - name: Build Corona Simulator
         shell: cmd
         run: |

diff --git a/platform/windows/Corona.SDK.Installer/Corona.SDK.Installer.wixproj b/platform/windows/Corona.SDK.Installer/Corona.SDK.Installer.wixproj
@@ -73,6 +73,7 @@ copy "$(TargetPath)" "$(SolutionDir)Bin\$(ProjectName)"</PostBuildEvent>
 
    mkdir "$(SolutionDir)Bin\Corona"
    move /y "$(SolutionDir)Bin\Native" "$(SolutionDir)Bin\Corona\"
+   move /y "$(SolutionDir)Bin\jre" "$(SolutionDir)Bin\Corona\"
 
    REM Compile all Corona related projects to the target directory.
    "$(DevEnvDir)devenv" "$(SolutionDir)Corona.Shell.sln" /rebuild "Release|Win32"