mirror of
https://github.com/rive-app/rive-cpp.git
synced 2026-01-18 21:21:17 +01:00
fix(rive-runtime)moved scripts to be in downstream (#9593) e9fce7bba1
moved scripts to be in downstream Co-authored-by: Jonathon Copeland <jcopela4@gmail.com>
This commit is contained in:
@@ -1 +1 @@
|
||||
ca744236fb1a747bba3f8ef04c396529c02e68b5
|
||||
e9fce7bba1285f24a706d5d03307200aa014c4c4
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
REM use fxc because sometimes msbuild is there but fxc is not. The opposite appears to never be true
|
||||
WHERE fxc >nul 2>&1
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
call ..\..\..\scripts\setup_windows_dev.bat
|
||||
call %~p0\setup_windows_dev.bat
|
||||
)
|
||||
cd %CD%
|
||||
sh build_rive.sh %*
|
||||
|
||||
@@ -4,8 +4,7 @@ $CWD = Get-Location
|
||||
if (Get-Command -Name "fxc" -ErrorAction SilentlyContinue){}
|
||||
else
|
||||
{
|
||||
$Rive_Runtime_Root = Split-Path -Parent $PSScriptRoot
|
||||
& $Rive_Runtime_Root\..\..\scripts\setup_windows_dev.ps1
|
||||
& $PSScriptRoot\setup_windows_dev.ps1
|
||||
}
|
||||
|
||||
Set-Location $CWD
|
||||
|
||||
19
build/setup_windows_dev.bat
Normal file
19
build/setup_windows_dev.bat
Normal file
@@ -0,0 +1,19 @@
|
||||
@echo off
|
||||
SET SCRIPT_PATH=%~dp0
|
||||
SET PATH=%PATH%;%SCRIPT_PATH%
|
||||
echo %SCRIPT_PATH%
|
||||
pushd %SCRIPT_PATH%\..\..\..\
|
||||
SET RIVE_ROOT=%CD%
|
||||
echo %CD%
|
||||
popd
|
||||
WHERE fxc >nul 2>&1
|
||||
IF %ERRORLEVEL% NEQ 0 (
|
||||
REM we could check where vs is install via the registery like stated here https://superuser.com/questions/539666/how-to-get-the-visual-studio-installation-path-in-a-batch-file but i think that is overkill
|
||||
if exist "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" (
|
||||
CALL "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat"
|
||||
) else (
|
||||
if exist "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat" (
|
||||
CALL "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"
|
||||
) else echo "Visual Studio 2022 does not appear to be installed, please install visual studio to C:\Program Files\Microsoft Visual Studio"
|
||||
)
|
||||
)
|
||||
23
build/setup_windows_dev.ps1
Normal file
23
build/setup_windows_dev.ps1
Normal file
@@ -0,0 +1,23 @@
|
||||
# requires Set-ExecutionPolicy Bypass -Scope CurrentUser
|
||||
$Rive_Root = Resolve-Path -Path "$PSScriptRoot\..\..\..\"
|
||||
$Build_Path = "$Rive_Root"+"\packages\runtime\build"
|
||||
$Env:Path += ";" + $Build_Path
|
||||
$Env:RIVE_ROOT=$Rive_Root
|
||||
# Add windows to path
|
||||
$CWD = Get-Location
|
||||
if (Get-Command -Name "fxc" -ErrorAction SilentlyContinue){}
|
||||
else
|
||||
{
|
||||
if (Test-Path "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1" -PathType Leaf) {
|
||||
& "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\Launch-VsDevShell.ps1"
|
||||
} else {
|
||||
if ("C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1") {
|
||||
& 'C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1'
|
||||
}
|
||||
else {
|
||||
Write-Error "Visual Studio 2022 does not appear to be installed, please install visual studio to C:\Program Files\Microsoft Visual Studio"
|
||||
exit
|
||||
}
|
||||
}
|
||||
}
|
||||
Set-Location $CWD
|
||||
Reference in New Issue
Block a user