diff --git a/README.md b/README.md index 842c362..dff4136 100644 --- a/README.md +++ b/README.md @@ -9,17 +9,30 @@ Licensed under the terms of the GNU General Public License, version 2 or later ( This branch is an WIP experimental rewrite to simplify how elf2rpl works and hopefully make it more correct for more advanced C++ programs. ## Requirements -- The as of yet unreleased [devkitPPC r31](https://github.com/devkitPro/buildscripts/tree/devkitPPC_r31) +- A modern compiler with C++14/17 support +- CMake +- zlib +- [devkitPPC r31+](https://devkitpro.org/wiki/Getting_Started) -## Linux -Requires CMake + Make + [devkitPPC](https://github.com/exjam/buildscripts) + libzdev +## Windows +Use [WSL](https://docs.microsoft.com/en-us/windows/wsl/install-win10) and then follow the Linux instructions. + +For example, if you installed Ubuntu then you might setup your environment like: ``` -export DEVKITPPC= +sudo apt install cmake zlib1g-dev gcc-7 g++-7 +wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb +sudo dpkg -i devkitpro-pacman.deb +sudo dkp-pacman -S devkitPPC wiiload +``` + +## Linux +``` +export DEVKITPPC=/opt/devkitpro/devkitPPC git clone --recursive https://github.com/decaf-emu/wut.git cd wut mkdir build && cd build -cmake -DCMAKE_INSTALL_PREFIX= -DDEVKITPPC=$DEVKITPPC ../ +cmake -DCMAKE_INSTALL_PREFIX= ../ make make install export WUT_ROOT= diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 7eda416..0000000 --- a/appveyor.yml +++ /dev/null @@ -1,45 +0,0 @@ -clone_depth: 10 - -version: 1.0.{build} - -image: Visual Studio 2017 - -platform: - - x64 - -configuration: - - Release - -# - appveyor DownloadFile https://downloads.devkitpro.org/msys-2.10.0.7z -# - 7z x msys-2.10.0.7z -oC:\msys2 -# - C:\msys2\msys2\usr\bin\bash.exe --login -c exit -# - C:\msys2\msys2\usr\bin\pacman.exe -Syu --noconfirm -# - C:\msys2\msys2\usr\bin\pacman.exe -S devkitPPC --noconfirm --needed -# - set DEVKITPPC=C:\msys2\msys2\opt\devkitpro\devkitPPC - -install: - - git submodule update --init --recursive - - appveyor DownloadFile https://kent.dl.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-bin.zip - - 7z x make-3.81-bin.zip -oC:\make - - appveyor DownloadFile https://netix.dl.sourceforge.net/project/gnuwin32/make/3.81/make-3.81-dep.zip - - 7z x make-3.81-dep.zip -oC:\make - - set PATH=%PATH%;C:/make/bin - - appveyor DownloadFile https://netcologne.dl.sourceforge.net/project/devkitpro/devkitPPC/devkitPPC_r29-1/devkitPPC_r29-1-win32.exe - - 7z x devkitPPC_r29-1-win32.exe -oC:\ -y - - set DEVKITPPC=C:/devkitPPC - -before_build: - - mkdir build - - cd build - - cmake -DCMAKE_INSTALL_PREFIX=install -G "Visual Studio 15 2017 Win64" ../ - -build_script: - - msbuild INSTALL.vcxproj /p:Configuration=Release /p:Platform=x64 - -after_build: - - cd install - - 7z a wut.zip . - -artifacts: - - path: build\install\wut.zip - name: wut