diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 653d3f4d..c535fdaa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,7 +26,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get -y install build-essential gcc-multilib g++-multilib libc6:i386 + sudo apt-get -y install build-essential ninja-build python3 gcc-multilib g++-multilib libc6:i386 curl -L https://cdn.discordapp.com/attachments/727918646525165659/917185027656286218/GC_WII_COMPILERS.zip \ | bsdtar -xvf- -C tools --exclude Wii mv tools/GC/* tools/mwcc_compiler/ @@ -36,7 +36,9 @@ jobs: cmake -B build cmake --build build - name: Build - run: make -j$(nproc) WINE=./tools/WiBo/build/wibo GENERATE_MAP=1 VERSION=${{matrix.version}} + run: | + python3 configure.py --map --version ${{matrix.version}} --wine ./tools/WiBo/build/wibo + ninja - name: Upload map uses: actions/upload-artifact@v2 with: diff --git a/configure.py b/configure.py index 421a99e2..1e89267c 100755 --- a/configure.py +++ b/configure.py @@ -10,12 +10,12 @@ from tools import ninja_syntax parser = argparse.ArgumentParser() parser.add_argument('--version', dest='version', default='0', help='version to build (0, 1, kor)') -parser.add_argument('--map', dest='map', action=argparse.BooleanOptionalAction, - default=False, help='generate map file') -parser.add_argument('--check', dest='check', action=argparse.BooleanOptionalAction, - default=True, help='check hash of resulting dol') -parser.add_argument('--static-libs', dest='static_libs', action=argparse.BooleanOptionalAction, - default=False, help='build and use static libs') +parser.add_argument('--map', dest='map', action='store_true', + help='generate map file') +parser.add_argument('--no-check', dest='check', action='store_false', + help='don\'t check hash of resulting dol') +parser.add_argument('--static-libs', dest='static_libs', action='store_true', + help='build and use static libs') parser.add_argument('--devkitppc', dest='devkitppc', help='path to devkitPPC') if os.name != "nt" and not "_NT-" in os.uname().sysname: parser.add_argument('--wine', dest='wine', help='path to wine (or wibo)')