diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..d304830 Binary files /dev/null and b/.vs/slnx.sqlite differ diff --git a/README.md b/README.md index 9d3fe18..220112d 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ originally written by saturnu, and released on the ## Building -If you want to build the menu, you need an n64 toolchain. When using windows 10, installation is totally automated through a script. +If you want to build the menu, you need an n64 toolchain. When using windows 10or Ubuntu, installation is totally automated through a script. ### Dependencies (installed automatically) * Windows 10 (Aniversary Update or above) / Ubuntu 16.04 (or above) @@ -24,8 +24,8 @@ If you want to build the menu, you need an n64 toolchain. When using windows 10, Clone this `Altra64` repo to a directory of your choice. -On Windows 10, browse to the tools directory and double click on setup-wsfl.cmd -On Ubuntu, browse to the tools directory and run the command ```chmod +x ./setup-linux.sh;source ./setup-linux.sh``` +On Windows 10, browse to the tools directory and double click on ```setup-wsfl.cmd``` +On Ubuntu, browse to the tools directory and run the command ```$ chmod +x ./setup-linux.sh;source ./setup-linux.sh``` ### Build `Altra64` @@ -41,6 +41,7 @@ on linux ``` $ make ``` +If it all worked, you will find `OS64.v64` in the `Altra64` bin directory. ### Debug Build `Altra64` To build the debug version of the Rom @@ -54,6 +55,8 @@ on linux ``` $ make debug ``` +If it all worked, you will find `OS64.v64` in the `Altra64` bin directory. + ### Clean `Altra64` Finally, we can clean the build objects from the project @@ -68,4 +71,4 @@ on linux $ make clean ``` -If it all worked, you will find `OS64.v64` in the `Altra64` bin directory. +Enjoy! diff --git a/tools/reset-wsfl.cmd b/tools/reset-wsfl.cmd new file mode 100644 index 0000000..d4219bf --- /dev/null +++ b/tools/reset-wsfl.cmd @@ -0,0 +1,51 @@ +:::::::::::::::::::::::::::::::::::::::::::: +:: Elevate.cmd - Version 2 +:: Automatically check & get admin rights +:::::::::::::::::::::::::::::::::::::::::::: +@echo off +CLS +ECHO. +ECHO ============================= +ECHO Running Admin shell +ECHO ============================= + +:init +setlocal DisableDelayedExpansion +set "batchPath=%~0" +for %%k in (%0) do set batchName=%%~nk +set "vbsGetPrivileges=%temp%\OEgetPriv_%batchName%.vbs" +setlocal EnableDelayedExpansion + +:checkPrivileges +NET FILE 1>NUL 2>NUL +if '%errorlevel%' == '0' ( goto gotPrivileges ) else ( goto getPrivileges ) + +:getPrivileges +if '%1'=='ELEV' (echo ELEV & shift /1 & goto gotPrivileges) +ECHO. +ECHO ************************************** +ECHO Invoking UAC for Privilege Escalation +ECHO ************************************** + +ECHO Set UAC = CreateObject^("Shell.Application"^) > "%vbsGetPrivileges%" +ECHO args = "ELEV " >> "%vbsGetPrivileges%" +ECHO For Each strArg in WScript.Arguments >> "%vbsGetPrivileges%" +ECHO args = args ^& strArg ^& " " >> "%vbsGetPrivileges%" +ECHO Next >> "%vbsGetPrivileges%" +ECHO UAC.ShellExecute "!batchPath!", args, "", "runas", 1 >> "%vbsGetPrivileges%" +"%SystemRoot%\System32\WScript.exe" "%vbsGetPrivileges%" %* +exit /B + +:gotPrivileges +setlocal & pushd . +cd /d %~dp0 +if '%1'=='ELEV' (del "%vbsGetPrivileges%" 1>nul 2>nul & shift /1) + +:::::::::::::::::::::::::::: +::START +:::::::::::::::::::::::::::: +@echo on + +lxrun /uninstall /full + +pause \ No newline at end of file