fix core reference + install script tidying

master
Evan Hemsley 2020-07-11 14:20:10 -07:00
parent d22954e503
commit c79ac15ab1
2 changed files with 20 additions and 5 deletions

View File

@ -24,6 +24,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\FNA\FNA.Core.csproj"/> <ProjectReference Include="..\FNA\FNA.Core.csproj"/>
<ProjectReference Include="..\encompass-cs\encompass-cs\encompass-cs.csproj" />
</ItemGroup> </ItemGroup>
<Import Project="..\build\CopyFNALibs.targets"/> <Import Project="..\build\CopyFNALibs.targets"/>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

View File

@ -7,6 +7,9 @@
# Get the directory of this script # Get the directory of this script
MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
FNA_VERSION=20.07
ENCOMPASS_VERSION=0.21.1
readlinkf(){ perl -MCwd -e 'print Cwd::abs_path shift' "$1";} readlinkf(){ perl -MCwd -e 'print Cwd::abs_path shift' "$1";}
# Checks if git is installed # Checks if git is installed
@ -19,12 +22,15 @@ function checkGit()
fi fi
} }
# Pulls FNA from the git master branch # Pulls FNA from github
function pullFNA() function pullFNA()
{ {
checkGit checkGit
git submodule add https://github.com/FNA-XNA/FNA.git git submodule add https://github.com/FNA-XNA/FNA.git
echo "Updating to the latest git version of FNA..." cd FNA
git checkout $FNA_VERSION
cd ..
echo "Updating to the latest version of FNA..."
git submodule update --init --recursive git submodule update --init --recursive
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Finished updating!" echo "Finished updating!"
@ -34,12 +40,15 @@ function pullFNA()
fi fi
} }
# Pulls Encompass from git # Pulls Encompass from gitea
function pullEncompass() function pullEncompass()
{ {
checkGit checkGit
echo "Updating to latest git version of Encompass..." echo "Updating to latest version of Encompass..."
git submodule add https://gitea.moonside.games/MoonsideGames/encompass-cs.git git submodule add https://gitea.moonside.games/MoonsideGames/encompass-cs.git
cd encompass-cs
git checkout $ENCOMPASS_VERSION
cd ..
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo "Finished updating!" echo "Finished updating!"
else else
@ -108,4 +117,9 @@ pullFNA
pullEncompass pullEncompass
echo "Project $newProjectName created at: " echo "Project $newProjectName created at: "
if [ "$(uname)" == "Darwin" ]; then
echo $(readlinkf $NEW_PROJECT_DIR) echo $(readlinkf $NEW_PROJECT_DIR)
else
echo $(readlink -f $NEW_PROJECT_DIR)
fi