Fix discs games

Fixes #6
RiiConnect24 · Mar 28, 2023 · 3c1a561 · 3c1a561
1 parent c2db4fe
commit 3c1a561
Show file tree

Hide file tree

Showing 12 changed files with 314 additions and 225 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,66 @@
+BasedOnStyle: LLVM
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: Consecutive
+AlignConsecutiveMacros: AcrossEmptyLinesAndComments
+AlignOperands: Align
+AllowAllArgumentsOnNextLine: false
+AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Always
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: Always
+AllowShortLambdasOnASingleLine: All
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterReturnType: None
+AlwaysBreakTemplateDeclarations: Yes
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: false
+  AfterClass: false
+  AfterControlStatement: Never
+  AfterEnum: false
+  AfterFunction: false
+  AfterNamespace: false
+  AfterUnion: false
+  BeforeCatch: false
+  BeforeElse: false
+  IndentBraces: false
+  SplitEmptyFunction: false
+  SplitEmptyRecord: true
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakInheritanceList: BeforeColon
+ColumnLimit: 0
+CompactNamespaces: false
+ContinuationIndentWidth: 8
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth: 4
+KeepEmptyLinesAtTheStartOfBlocks: true
+MaxEmptyLinesToKeep: 2
+NamespaceIndentation: All
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PointerAlignment: Right
+ReflowComments: false
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+TabWidth: 4
+UseTab: Never
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,64 +3,57 @@ name: CI-Release
 on:
   push:
     branches:
-      - main
       - master
-    
+
 jobs:
   clang-format:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
-    - name: clang-format
-      run: |
-        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./src
+      - uses: actions/checkout@v3
+      - name: clang-format
+        run: |
+          docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
   build-binary:
     runs-on: ubuntu-22.04
     needs: clang-format
     steps:
-    - uses: actions/checkout@v2
-    - name: build binary
-      run: |
-        docker build . -t builder
-        docker run --rm -v ${PWD}:/project builder make
-    - uses: actions/upload-artifact@master
-      with:
-       name: binary
-       path: "*.wps"
+      - uses: actions/checkout@v3
+      - name: create version.h
+        run: |
+          git_hash=$(git rev-parse --short "$GITHUB_SHA")
+          cat <<EOF > ./src/version.h
+          #pragma once
+          #define VERSION_EXTRA " (nightly-$git_hash)"
+          EOF
+      - name: build binary
+        run: |
+          docker build . -t builder
+          docker run --rm -v ${PWD}:/project builder make
+      - uses: actions/upload-artifact@master
+        with:
+          name: binary
+          path: "*.wps"
   deploy-binary:
     needs: build-binary
     runs-on: ubuntu-22.04
-    steps:   
-    - name: Get environment variables
-      id: get_repository_name
-      run: |
-        echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") >> $GITHUB_ENV
-        echo DATETIME=$(echo $(date '+%Y%m%d-%H%M%S')) >> $GITHUB_ENV 
-    - uses: actions/download-artifact@master
-      with:
-        name: binary
-    - name: zip artifact
-      run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip *.wps
-    - name: Create Release
-      id: create_release
-      uses: actions/create-release@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
-        release_name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
-        draft: false
-        prerelease: true
-        body: |
-           Not a stable release:
-           ${{ github.event.head_commit.message }}
-    - name: Upload Release Asset
-      id: upload-release-asset 
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps 
-        asset_path: ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
-        asset_name: ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
-        asset_content_type: application/zip
+    steps:
+      - name: Get environment variables
+        id: get_repository_name
+        run: |
+          echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//") >> $GITHUB_ENV
+          echo DATETIME=$(echo $(date '+%Y%m%d-%H%M%S')) >> $GITHUB_ENV
+      - uses: actions/download-artifact@master
+        with:
+          name: binary
+      - name: zip artifact
+        run: zip -r ${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip *.wps
+      - name: Create Release
+        uses: "softprops/action-gh-release@v1"
+        with:
+          tag_name: ${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
+          draft: false
+          prerelease: true
+          generate_release_notes: true
+          name: Nightly-${{ env.REPOSITORY_NAME }}-${{ env.DATETIME }}
+          files: |
+            ./${{ env.REPOSITORY_NAME }}_${{ env.DATETIME }}.zip
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,20 +6,38 @@ jobs:
   clang-format:
     runs-on: ubuntu-22.04
     steps:
-    - uses: actions/checkout@v2
-    - name: clang-format
-      run: |
-        docker run --rm -v ${PWD}:/src  wiiuenv/clang-format:13.0.0-2 -r ./src
+      - uses: actions/checkout@v3
+      - name: clang-format
+        run: |
+          docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./src
+  check-build-with-logging:
+    runs-on: ubuntu-22.04
+    needs: clang-format
+    steps:
+      - uses: actions/checkout@v3
+      - name: build binary with logging
+        run: |
+          docker build . -t builder
+          docker run --rm -v ${PWD}:/project builder make DEBUG=VERBOSE
+          docker run --rm -v ${PWD}:/project builder make clean
+          docker run --rm -v ${PWD}:/project builder make DEBUG=1
   build-binary:
     runs-on: ubuntu-22.04
     needs: clang-format
     steps:
-    - uses: actions/checkout@v2
-    - name: build binary
-      run: |
-        docker build . -t builder
-        docker run --rm -v ${PWD}:/project builder make
-    - uses: actions/upload-artifact@master
-      with:
-       name: binary
-       path: "*.wps"
+      - uses: actions/checkout@v3
+      - name: create version.h
+        run: |
+          git_hash=$(git rev-parse --short "${{ github.event.pull_request.head.sha }}")
+          cat <<EOF > ./src/version.h
+          #pragma once
+          #define VERSION_EXTRA " (nightly-$git_hash)"
+          EOF
+      - name: build binary
+        run: |
+          docker build . -t builder
+          docker run --rm -v ${PWD}:/project builder make
+      - uses: actions/upload-artifact@master
+        with:
+          name: binary
+          path: "*.wps"
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@ build/
 *.wps
 cmake-build-debug/
 CMakeLists.txt
-
+.vscode/settings.json
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
@@ -4,18 +4,13 @@
             "name": "Linux",
             "includePath": [
                 "${workspaceFolder}/**",
-                "/opt/devkitpro/devkitPPC/powerpc-eabi/include/**",
-                "/opt/devkitpro/devkitPPC/include/**",
-                "/opt/devkitpro/portlibs/ppc/include/**",
-                "/opt/devkitpro/portlibs/wiiu/include/**",
-                "/opt/devkitpro/wut/include/**",
-                "/opt/devkitpro/wups/include/**"
+                "/opt/devkitpro/**"
             ],
             "defines": [],
-            "compilerPath": "/opt/devkitpro/devkitPPC/bin/powerpc-eabi-gcc",
+            "compilerPath": "/usr/bin/gcc",
             "cStandard": "gnu17",
             "cppStandard": "gnu++17",
-            "intelliSenseMode": "linux-gcc-x86"
+            "intelliSenseMode": "linux-gcc-x64"
         }
     ],
     "version": 4

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
-FROM wiiuenv/devkitppc:20220907
+FROM ghcr.io/wiiu-env/devkitppc:20230326
 
-COPY --from=wiiuenv/wiiupluginsystem:20220904 /artifacts $DEVKITPRO
+COPY --from=ghcr.io/wiiu-env/wiiupluginsystem:20230316 /artifacts $DEVKITPRO
 
 WORKDIR project
diff --git a/Makefile b/Makefile
@@ -30,7 +30,7 @@ INCLUDES	:=	src
 #-------------------------------------------------------------------------------
 # options for code generation
 #-------------------------------------------------------------------------------
-CFLAGS	:=	-g -Wall -O3 -ffunction-sections -fno-exceptions \
+CFLAGS	:=	-Wall -O2 -ffunction-sections \
 			$(MACHDEP)
 
 CFLAGS	+=	$(INCLUDE) -D__WIIU__ -D__WUT__ -D__WUPS__ 
@@ -43,16 +43,15 @@ LDFLAGS	=	-g $(ARCH) $(RPXSPECS) -Wl,-Map,$(notdir $*.map) $(WUPSSPECS)
 LIBS	:=  -lcurl -lmbedtls -lmbedcrypto -lmbedx509 -lwups -lwut -lz
 
 ifeq ($(DEBUG),1)
-CXXFLAGS += -DDEBUG -g
-CFLAGS += -DDEBUG -g
+	CXXFLAGS += -DDEBUG -g
+	CFLAGS += -DDEBUG -g
 endif
 
 ifeq ($(DEBUG),VERBOSE)
-CXXFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
-CFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
+	CXXFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
+	CFLAGS += -DDEBUG -DVERBOSE_DEBUG -g
 endif
 
-
 ifdef SERVER
     CFLAGS += -DSERVER=$(SERVER)
 endif