Fix libdragon build issues #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

networkfusion wants to merge 118 commits into develop-xio-new from develop-dockerbuild

.github/workflows/build-ed64-example-rom.yml

-Original file line number
+Diff line change
@@ -1,6 +1,14 @@
     name: Build ED64 Example ROM
-    on: [push, pull_request]
+    on: [push] #, pull_request]
+    # on:
+    #   push:
+    #     paths:
+    #       - '/**/ED64-XIO/*'
+    #   pull_request:
+    #     paths:
+    #       - '/**/ED64-XIO/*'
     jobs:
       build:
         runs-on: ubuntu-latest
@@ Expand All / @@ -10,27 +18,75 @@ jobs: @@
         steps:
           - uses: actions/checkout@v2
             name: Checkout Code
+            with:
+              path: ${{ github.workspace }}
+          - name: Checkout libdragon repo
+            uses: actions/checkout@v2
+            with:
+              repository: dragonminded/libdragon
+              path: ${{ github.workspace }}/ED64-XIO/libdragon/
+              ref: '89d17be8563a44a9b95873d436832a1222757cdc'
-          - name: Install Libdragon container
+          - name: check current work dir
+            working-directory: ${{ github.workspace }}
             run: |
-              sudo npm install -g libdragon
-              libdragon make
-              libdragon make install
-              libdragon make tools-install
-              # libdragon init
-              # libdragon install
+              ls
+              echo "switch to ED64-XIO"
+              cd ./ED64-XIO
+              ls
+              echo "switch to libdragon"
+              cd ./libdragon/
+              ls
+              echo "switch back to ED64-XIO"
+              cd ..
+              ls
           - name: Setup Build environment
+            working-directory: ${{ github.workspace }}
             run: |
-              cd ${{ github.workspace }}/ED64-XIO/
-              mkdir bin && mkdir bin/release && mkdir bin/debug && mkdir obj
-              libdragon start
+              ls
+              mkdir -p ED64-XIO/bin && mkdir -p ED64-XIO/bin/release && mkdir -p ED64-XIO/bin/debug && mkdir obj
+          - name: patch libdragon make (workaround ignore warnings as errors)
+            working-directory: ${{ github.workspace }}/ED64-XIO/libdragon
+            run: |
+              ls
+              sed -z -i.bak 's/ -Wall -Werror / /' ./Makefile
+          - name: Buid libdragon and ROM
+            working-directory: ${{ github.workspace }}/ED64-XIO
+            run: >-
+              docker run
+              --mount type=bind,source=$(pwd),target=/libdragon
+              --workdir=/libdragon
+              ghcr.io/dragonminded/libdragon:latest
+              echo "ED64-XIO dir" && ls &&
+              cd libdragon &&
+              echo "libdragon dir" && ls &&
+              make libdragon && sudo make install &&
+              make tools && sudo make tools-install &&
+              cd .. &&
+              echo "ED64-XIO dir" && ls &&
+              make ${{ matrix.releasetype }}
-          - name: Build ROM
-            run: cd ${{ github.workspace }}/ED64-XIO/ && libdragon make ${{ matrix.releasetype }}
+          #     sudo npm install -g libdragon
+          #     libdragon init
+          #     #libdragon exec bash -c 'export N64_CFLAGS="-DNDEBUG"'
+          #     #libdragon exec bash -c N64_CFLAGS="-DNDEBUG"
+          #     #N64_CFLAGS="-DNDEBUG" && libdragon install
+          #     sed -z -i.bak 's/CFLAGS+=$(N64_CFLAGS) /CFLAGS+=$(N64_CFLAGS) -DNDEBUG /' ./libdragon/Makefile
+          #     sed -z -i.bak 's/#define assertf(expr, msg, ...)    ({ })/#define assertf(expr, msg, ...)    ({ (void)(expr); })/' ./libdragon/include/debug.h
+          #     sed -z -i.bak '1s/^/#undef NDEBUG\n/' ./libdragon/src/debug.c
+          #     sed -z -i.bak 's/bool direction = (out<=in);/bool direction = (out<=in); (void)direction;/' ./libdragon/src/audio/libxm/context.c
+          #     sed -z -i.bak 's/assert(sz == dec_size);/assert(sz == dec_size); (void)sz;/' ./libdragon/src/audio/libxm/play.c
+          #     libdragon install
+          #     libdragon start
           - name: Upload Artifact
             uses: actions/[email protected]
             with:
               name: ED64-XIO-SAMPLE_N64_ROM-${{ matrix.releasetype }}
-              path: ${{ github.workspace }}/ED64-XIO/bin/${{ matrix.releasetype }}/ED64-XIO-SAMPLE.v64
+              path: ${{ github.workspace }}/**/ED64-XIO/bin/${{ matrix.releasetype }}/ED64-XIO-SAMPLE.v64

.github/workflows/build-usb64-linux.yml

-Original file line number
+Diff line change
@@ -1,6 +1,13 @@
     name: Build Linux Usb64 App
-    on: [push, pull_request]
+    on:
+      push:
+        paths:
+          - '/**/usb64/*'
+      pull_request:
+        paths:
+          - '/**/usb64/*'
     jobs:
       build:
         runs-on: ubuntu-latest
@@ Expand Down @@

.github/workflows/build-usb64-windows.yml

-Original file line number
+Diff line change
@@ -1,6 +1,13 @@
     name: Build Windows Usb64 App
-    on: [push, pull_request]
+    on:
+      push:
+        paths:
+          - '/**/usb64/*'
+      pull_request:
+        paths:
+          - '/**/usb64/*'
     jobs:
       build:
         runs-on: windows-latest
@@ Expand Down @@

ED64-XIO/Makefile

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     PROG_NAME =	ED64-XIO-SAMPLE
-    ROMSIZE = 256K
+    ROMSIZE = 1048576B
     ifdef SystemRoot
@@ Expand Down @@

ED64-XIO/ff/diskio.h

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     /*-----------------------------------------------------------------------/
-    /  Low level disk interface modlue include file   (C)ChaN, 2019          /
+    /  Low level disk interface module include file   (C)ChaN, 2019          /
     /-----------------------------------------------------------------------*/
     #ifndef _DISKIO_DEFINED
@@ Expand Down @@

ED64-XIO/src/bios.c

-Original file line number
+Diff line change
@@ Expand Up / @@ -121,7 +121,7 @@ void ed64_bios_init() { @@
         ed64_bios_rom_savetype_set(ED64_SAVE_OFF);
         /* Always successful for now */
-        return 0;
+        //return 0;
     }
     /**
@@ Expand Down @@

ED64-XIO/src/sys.c

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -165,12 +165,12 @@ void sys_n64_pi_read(void *ram, unsigned long pi_address, unsigned long len) {
  
        data_cache_hit_writeback_invalidate(ram, len);

        disable_interrupts();

        while (dma_busy());

        dma_wait();

        IO_WRITE(PI_STATUS_REG, 3);

        PI_regs->ram_address = ram;

        PI_regs->pi_address = pi_address; //(pi_address | 0x10000000) & 0x1FFFFFFF;

        PI_regs->write_length = len - 1;

        while (dma_busy());

        dma_wait();

        enable_interrupts();

    }

    @@ -182,12 +182,12 @@ void sys_n64_pi_write(void *ram, unsigned long pi_address, unsigned long len) {
  
        data_cache_hit_writeback(ram, len);

        disable_interrupts();

        while (dma_busy());

        dma_wait();

        IO_WRITE(PI_STATUS_REG, 3);

        PI_regs->ram_address = ram;

        PI_regs->pi_address = pi_address; //(pi_address | 0x10000000) & 0x1FFFFFFF;

        PI_regs->read_length = len - 1;

        while (dma_busy());

        dma_wait();

        enable_interrupts();

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix libdragon build issues #13

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Fix libdragon build issues #13

Are you sure you want to change the base?

Uh oh!

Fix libdragon build issues #13

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing